From 38e5cf0983e02b2fc77d77adfd9b937768dfcfd5 Mon Sep 17 00:00:00 2001
From: Michael Matz <matz@suse.de>
Date: Wed, 18 May 2016 20:36:59 +0200
Subject: [PATCH] tccpp: Fix macro_is_equal

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.
---
 tccpp.c            | 9 +++++----
 tests/pp/16.c      | 3 +++
 tests/pp/16.expect | 2 ++
 3 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 tests/pp/16.c
 create mode 100644 tests/pp/16.expect

diff --git a/tccpp.c b/tccpp.c
index ebbd051..6446c9c 100644
--- a/tccpp.c
+++ b/tccpp.c
@@ -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);
diff --git a/tests/pp/16.c b/tests/pp/16.c
new file mode 100644
index 0000000..8b5b642
--- /dev/null
+++ b/tests/pp/16.c
@@ -0,0 +1,3 @@
+/* The following should warn */
+#define A ...
+#define A <<=
diff --git a/tests/pp/16.expect b/tests/pp/16.expect
new file mode 100644
index 0000000..695d6d4
--- /dev/null
+++ b/tests/pp/16.expect
@@ -0,0 +1,2 @@
+
+16.c:3: warning: A redefined