diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bda64dca09a..1810deb2ac1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-15  Greg McGary  <greg@mcgary.org>
+
+	* cppmacro.c (check_trad_stringification): Check token
+	text pointers against limit before dereferencing.
+
 2000-09-15  Joseph S. Myers  <jsm28@cam.ac.uk>
 
 	* c-common.c (format_wanted_type): New structure.
diff --git a/gcc/cppmacro.c b/gcc/cppmacro.c
index 2b16fd4757c..82dfd7f0d0f 100644
--- a/gcc/cppmacro.c
+++ b/gcc/cppmacro.c
@@ -645,11 +645,13 @@ check_trad_stringification (pfile, info, string)
       const cpp_token *token;
 
       /* Find the start of an identifier.  */
-      while (!is_idstart (*p) && p < limit) p++;
+      while (p < limit && !is_idstart (*p))
+	p++;
 
       /* Find the end of the identifier.  */
       q = p;
-      while (is_idchar (*q) && q < limit) q++;
+      while (q < limit && is_idchar (*q))
+	q++;
      
       /* Loop over the function macro arguments to see if the
 	 identifier inside the string matches one of them.  */