tradcpp.c (do_define): Make sure we don't walk past limit.

	* tradcpp.c (do_define): Make sure we don't walk past limit.

	* gcc.dg/cpp/tr-define.c: New test.

From-SVN: r41773

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 83ca906c43d1820d94c8bf3f7f2a5108468c770e..301de81d4c35bcdb30082165a29731bc7bef43d2 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-02  Jakub Jelinek  <jakub@redhat.com>
+
+       * tradcpp.c (do_define): Make sure we don't walk past limit.
+
 2000-05-01  Franz Sirl  <Franz.Sirl-kernel@lauterbach.com>
 
        * config/rs6000/rs6000.c (rs6000_legitimate_address): Allow any stack

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e99ee8480a7039cde98ffe1b9e062b50b9630ec3..af464e59bff268bf193ced28c4e1cfc8f81fdc1f 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-02  Jakub Jelinek  <jakub@redhat.com>
+
+       * gcc.dg/cpp/tr-define.c: New test.
+
 2001-05-01  Loren J. Rittle  <ljrittle@acm.org>
 
        * g++.old-deja/g++.abi/cxa_vec.C: Get malloc() from

diff --git a/gcc/testsuite/gcc.dg/cpp/tr-define.c b/gcc/testsuite/gcc.dg/cpp/tr-define.c
new file mode 100644 (file)
index 0000000..54bd7a7
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/cpp/tr-define.c
@@ -0,0 +1,2 @@
+/* { dg-do preprocess } */
+/* { dg-options "-traditional -DDEFINE1DEFINE -DDEFINE2DEFIN=" } */

diff --git a/gcc/tradcpp.c b/gcc/tradcpp.c
index d5674736f476201f43c35bad3c34aecd02101501..bfb12027b83dead805a23a3663758e8bf97f5492 100644 (file)
--- a/gcc/tradcpp.c
+++ b/gcc/tradcpp.c
@@ -2670,8 +2670,8 @@ do_define (buf, limit, op)
       }
     }
 
-    ++bp;                      /* skip paren */
-    while (is_nvspace (*bp))   /* and leading whitespace */
+    ++bp;                                      /* skip paren */
+    while (is_nvspace (*bp) && bp < limit)     /* and leading whitespace */
       ++bp;
     /* now everything from bp before limit is the definition. */
     defn = collect_expansion (bp, limit, argno, arg_ptrs);
@@ -2698,7 +2698,7 @@ do_define (buf, limit, op)
     }
   } else {
     /* simple expansion or empty definition; skip leading whitespace */
-    while (is_nvspace (*bp))
+    while (is_nvspace (*bp) && bp < limit)
       ++bp;
     /* now everything from bp before limit is the definition. */
     defn = collect_expansion (bp, limit, -1, 0);