From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 25 May 1998 20:14:54 +0000 (+0000)
Subject: (re_search_2): Don't use ++ inside RE_TRANSLATE.
X-Git-Tag: emacs-20.3~840
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=33c46939565fcaa1212177953baf2823046b96bd;p=emacs.git

(re_search_2): Don't use ++ inside RE_TRANSLATE.
(re_match_2_internal): Likewise.
---

diff --git a/src/regex.c b/src/regex.c
index ed4cfc9d95a..a638e1734dd 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -3807,12 +3807,18 @@ re_search_2 (bufp, string1, size1, string2, size2, startpos, range, regs, stop)
 		  else
 		    while (range > lim
 			   && !fastmap[(unsigned char)
-				       RE_TRANSLATE (translate, (unsigned char) *d++)])
-		      range--;
+				       RE_TRANSLATE (translate, (unsigned char) *d)])
+		      {
+			d++;
+			range--;
+		      }
 		}
 	      else
-		while (range > lim && !fastmap[(unsigned char) *d++])
-		  range--;
+		while (range > lim && !fastmap[(unsigned char) *d])
+		  {
+		    d++;
+		    range--;
+		  }
 
 	      startpos += irange - range;
 	    }
@@ -4526,9 +4532,10 @@ re_match_2_internal (bufp, string1, size1, string2, size2, pos, regs, stop)
 		do
 		  {
 		    PREFETCH ();
-		    if ((unsigned char) RE_TRANSLATE (translate, (unsigned char) *d++)
+		    if ((unsigned char) RE_TRANSLATE (translate, (unsigned char) *d)
 			!= (unsigned char) *p++)
 		      goto fail;
+		    d++;
 		  }
 		while (--mcnt);
 	    }