GNU bug report logs - #1982
23.0.60; Infinite loop in align-regexp

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 1982 in the body.
You can then email your comments to 1982 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> emacsbugs.donarmstrong.com (full text, mbox):

From: Geoff Gole <geoffgole <at> gmail.com>
To: emacs-pretest-bug <at> gnu.org
Subject: 23.0.60; Infinite loop in align-regexp
Date: Thu, 22 Jan 2009 08:30:36 +0900

[Message part 1 (text/plain, inline)]

This was originally sent to emacs-devel. Since it's been a week with
no response I'm going to assume that that was the wrong place, thus
I'm copying it here. My apologies if the duplication is inappropriate.

For certain choices of regexp and region text, align-regexp will enter
an infinite loop. To reproduce:

  emacs -Q
  RET foo
  C-SPC C-a
  M-x align-regexp
  \<

Note that the infinite loop won't occur for text at the beginning of
the buffer, so make sure to test at least one newline down.

I'm suprised that this hasn't come up before. I would have thought
aligning to beginning-of-word would be a common case. Anyway, the
problem seems to be that align-region assumes that a successful search
will always move point forward. The following patch attempts to fix
this:

--- /home/ggole/src/emacs/lisp/align.el	2009-01-05 12:18:39.000000000 +0900
+++ loopfix-align.el	2009-01-22 08:15:59.000000000 +0900
@@ -1307,6 +1307,7 @@
 		 (rulesep (assq 'separate rule))
 		 (thissep (if rulesep (cdr rulesep) separate))
 		 same (eol 0)
+		 search-origin
 		 group group-c
 		 spacing spacing-c
 		 tab-stop tab-stop-c
@@ -1412,6 +1413,7 @@
 		      ;; while we can find the rule in the alignment
 		      ;; region..
 		      (while (and (< (point) end-mark)
+				  (setq search-origin (point))
 				  (if regfunc
 				      (funcall regfunc end-mark nil)
 				    (re-search-forward regexp
@@ -1436,7 +1438,8 @@
 			;; if the search ended us on the beginning of
 			;; the next line, move back to the end of the
 			;; previous line.
-			(if (bolp)
+			(if (and (bolp)
+				 (> (point) search-origin))
 			    (forward-char -1))

 			;; lookup the `group' attribute the first time
@@ -1576,7 +1579,12 @@
 			    ;; the next line; don't bother searching
 			    ;; anymore on this one
 			    (if (and (not repeat) (not (bolp)))
-				(forward-line)))))
+				(forward-line))
+
+			    ;; if the search did not change point,
+			    ;; move forward to avoid an infinite loop
+			    (if (= (point) search-origin)
+				(forward-char)))))

 		      ;; when they are no more matches for this rule,
 		      ;; align whatever was left over

[align-regexp-loopfix.diff (text/x-patch, attachment)]

Message #10 received at 1982-done <at> emacsbugs.donarmstrong.com (full text, mbox):

From: Chong Yidong <cyd <at> stupidchicken.com>
To: Geoff Gole <geoffgole <at> gmail.com>
Cc: 1982-done <at> debbugs.gnu.org
Subject: Re: 23.0.60; Infinite loop in align-regexp
Date: Sat, 24 Jan 2009 18:44:04 -0500

> For certain choices of regexp and region text, align-regexp will enter
> an infinite loop... Anyway, the problem seems to be that align-region
> assumes that a successful search will always move point forward. The
> following patch attempts to fix this:

Your patch looks OK, so I've checked it in.  Thanks very much.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.