mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-02-09 17:50:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

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

From-SVN: r34027
This commit is contained in:
Zack Weinberg 2000-05-19 17:43:38 +00:00 committed by Zack Weinberg
parent b4c40d3c2c
commit 021c89ed68
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gcc/ChangeLog
View File

@ -1,5 +1,8 @@
2000-05-19 Zack Weinberg <zack@wolery.cumb.org> 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. * cpplex.c (_cpp_scan_until): Clear AUX field of tokens.
* cpplib.c (do_unassert): Put the list to compare against on * cpplib.c (do_unassert): Put the list to compare against on
the stack. the stack.

6
gcc/cpphash.c
View File

@ -1578,7 +1578,7 @@ funlike_macroexpand (pfile, hp, args)
{ {
/* Arg is concatenated before: delete leading whitespace, /* Arg is concatenated before: delete leading whitespace,
whitespace markers, and no-reexpansion markers. */ whitespace markers, and no-reexpansion markers. */
while (p1 != l1) while (p1 < l1)
{ {
if (is_space(p1[0])) if (is_space(p1[0]))
p1++; p1++;
@ -1592,7 +1592,7 @@ funlike_macroexpand (pfile, hp, args)
{ {
/* Arg is concatenated after: delete trailing whitespace, /* Arg is concatenated after: delete trailing whitespace,
whitespace markers, and no-reexpansion markers. */ whitespace markers, and no-reexpansion markers. */
while (p1 != l1) while (p1 < l1)
{ {
if (is_space(l1[-1])) if (is_space(l1[-1]))
l1--; l1--;
@ -1612,7 +1612,7 @@ funlike_macroexpand (pfile, hp, args)
/* Delete any no-reexpansion marker that precedes /* Delete any no-reexpansion marker that precedes
an identifier at the beginning of the argument. */ 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; p1 += 2;
memcpy (xbuf + totlen, p1, l1 - p1); memcpy (xbuf + totlen, p1, l1 - p1);

10
gcc/testsuite/gcc.dg/20000519-1.c Normal file
View File

@ -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