From: Zack Weinberg <zack@wolery.cumb.org>
Date: Fri, 19 May 2000 17:43:38 +0000 (+0000)
Subject: cpphash.c (funlike_macroexpand): Make sure not to walk p1 past l1 when deleting white... 
X-Git-Tag: prereleases/libstdc++-2.92~6325
X-Git-Url: https://gcc.gnu.org/git/?a=commitdiff_plain;h=021c89ed68c151c45021fccf1bb5338ee817314c;p=gcc.git

cpphash.c (funlike_macroexpand): Make sure not to walk p1 past l1 when deleting whitespace and markers.

	* cpphash.c (funlike_macroexpand): Make sure not to walk p1
	past l1 when deleting whitespace and markers.

From-SVN: r34027
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 87308c1aba38..668a377724a3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,8 @@
 2000-05-19  Zack Weinberg  <zack@wolery.cumb.org>
 
+	* cpphash.c (funlike_macroexpand): Make sure not to walk p1
+	past l1 when deleting whitespace and markers.              
+
 	* cpplex.c (_cpp_scan_until): Clear AUX field of tokens.
 	* cpplib.c (do_unassert): Put the list to compare against on
 	the stack.
diff --git a/gcc/cpphash.c b/gcc/cpphash.c
index 3eb7d1a0e7a2..39c97354499b 100644
--- a/gcc/cpphash.c
+++ b/gcc/cpphash.c
@@ -1578,7 +1578,7 @@ funlike_macroexpand (pfile, hp, args)
 	    {
 	      /* Arg is concatenated before: delete leading whitespace,
 		 whitespace markers, and no-reexpansion markers.  */
-	      while (p1 != l1)
+	      while (p1 < l1)
 		{
 		  if (is_space(p1[0]))
 		    p1++;
@@ -1592,7 +1592,7 @@ funlike_macroexpand (pfile, hp, args)
 	    {
 	      /* Arg is concatenated after: delete trailing whitespace,
 		 whitespace markers, and no-reexpansion markers.  */
-	      while (p1 != l1)
+	      while (p1 < l1)
 		{
 		  if (is_space(l1[-1]))
 		    l1--;
@@ -1612,7 +1612,7 @@ funlike_macroexpand (pfile, hp, args)
 
 	  /* Delete any no-reexpansion marker that precedes
 	     an identifier at the beginning of the argument. */
-	  if (p1[0] == '\r' && p1[1] == '-')
+	  if (p1 + 2 <= l1 && p1[0] == '\r' && p1[1] == '-')
 	    p1 += 2;
 
 	  memcpy (xbuf + totlen, p1, l1 - p1);
diff --git a/gcc/testsuite/gcc.dg/20000519-1.c b/gcc/testsuite/gcc.dg/20000519-1.c
new file mode 100644
index 000000000000..82ab3a268618
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/20000519-1.c
@@ -0,0 +1,10 @@
+/* Regression test for preprocessor crash.
+   Reported by Mathias Froehlich <frohlich@na.uni-tuebingen.de>.  */
+/* { dg-do preprocess } */
+#define foo
+
+#define __CAT__(a,b,c,d) a##b##c##d
+#define CAT(a,b,c,d) __CAT__(a,b,c,d)
+
+#define bar CAT(,foo,bar,)
+bar