mirrors/tinycc
1
0
Fork 0
mirror of https://github.com/frida/tinycc synced 2024-12-24 05:56:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

tccpp: Fix macro_is_equal

Browse Source 
When tokens in macro definitions need cstr_buf inside get_tok_str,
the second might overwrite the first (happens when tokens are
multi-character non-identifiers, see testcase) in macro_is_equal,
failing to diagnose a difference.  Use a real local buffer.
This commit is contained in:
Michael Matz 2016-05-18 20:36:59 +02:00
parent 8080401ab0
commit 38e5cf0983
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tccpp.c
View File

@ -1280,17 +1280,18 @@ static int macro_is_equal(const int *a, const int *b)
{
CValue cv;
int t;
static CString localbuf;
if (!a || !b)
return 1;
while (*a && *b) {
/* first time preallocate static cstr_buf, next time only reset position to start */
cstr_reset(&cstr_buf);
/* first time preallocate static localbuf, next time only reset position to start */
cstr_reset(&localbuf);
TOK_GET(&t, &a, &cv);
cstr_cat(&cstr_buf, get_tok_str(t, &cv), 0);
cstr_cat(&localbuf, get_tok_str(t, &cv), 0);
TOK_GET(&t, &b, &cv);
if (strcmp(cstr_buf.data, get_tok_str(t, &cv)))
if (strcmp(localbuf.data, get_tok_str(t, &cv)))
return 0;
}
return !(*a || *b);

3
tests/pp/16.c Normal file
View File

@ -0,0 +1,3 @@
/* The following should warn */
#define A ...
#define A <<=

2
tests/pp/16.expect Normal file
View File

@ -0,0 +1,2 @@
16.c:3: warning: A redefined