From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 4 Apr 2011 07:33:02 +0000 (-0700)
Subject: * lread.c (lisp_file_lexically_bound_p): Use ints rather than endptrs.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~394^2~36
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=06a0259a1a1661b6128780092ff4a3dd59bc0256;p=emacs.git

* lread.c (lisp_file_lexically_bound_p): Use ints rather than endptrs.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index ab296dded6f..6ee8ec17888 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-04-04  Paul Eggert  <eggert@cs.ucla.edu>
 
+	* lread.c (lisp_file_lexically_bound_p): Use ints rather than endptrs.
+
 	* print.c (print_error_message): Avoid int overflow.
 
 	* font.c (font_list_entities): Redo for clarity,
diff --git a/src/lread.c b/src/lread.c
index 6a24569f552..e7bcd2b260b 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -818,7 +818,8 @@ lisp_file_lexically_bound_p (Lisp_Object readcharfun)
 
       while (in_file_vars)
 	{
-	  char var[100], *var_end, val[100], *val_end;
+	  char var[100], val[100];
+	  int i;
 
 	  ch = READCHAR;
 
@@ -826,19 +827,18 @@ lisp_file_lexically_bound_p (Lisp_Object readcharfun)
 	  while (ch == ' ' || ch == '\t')
 	    ch = READCHAR;
 
-	  var_end = var;
+	  i = 0;
 	  while (ch != ':' && ch != '\n' && ch != EOF)
 	    {
-	      if (var_end < var + sizeof var - 1)
-		*var_end++ = ch;
+	      if (i < sizeof var - 1)
+		var[i++] = ch;
 	      UPDATE_BEG_END_STATE (ch);
 	      ch = READCHAR;
 	    }
 
-	  while (var_end > var
-		 && (var_end[-1] == ' ' || var_end[-1] == '\t'))
-	    var_end--;
-	  *var_end = '\0';
+	  while (i > 0 && (var[i - 1] == ' ' || var[i - 1] == '\t'))
+	    i--;
+	  var[i] = '\0';
 
 	  if (ch == ':')
 	    {
@@ -848,22 +848,21 @@ lisp_file_lexically_bound_p (Lisp_Object readcharfun)
 	      while (ch == ' ' || ch == '\t')
 		ch = READCHAR;
 
-	      val_end = val;
+	      i = 0;
 	      while (ch != ';' && ch != '\n' && ch != EOF && in_file_vars)
 		{
-		  if (val_end < val + sizeof val - 1)
-		    *val_end++ = ch;
+		  if (i < sizeof val - 1)
+		    val[i++] = ch;
 		  UPDATE_BEG_END_STATE (ch);
 		  ch = READCHAR;
 		}
 	      if (! in_file_vars)
 		/* The value was terminated by an end-marker, which
 		   remove.  */
-		val_end -= 3;
-	      while (val_end > val
-		     && (val_end[-1] == ' ' || val_end[-1] == '\t'))
-		val_end--;
-	      *val_end = '\0';
+		i -= 3;
+	      while (i > 0 && (val[i - 1] == ' ' || val[i - 1] == '\t'))
+		i--;
+	      val[i] = '\0';
 
 	      if (strcmp (var, "lexical-binding") == 0)
 		/* This is it...  */