Fixed ticket danmar#3675.

citypw · Mar 22, 2012 · 780481e · 780481e
1 parent d04698d
commit 780481e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/lib/preprocessor.cpp b/lib/preprocessor.cpp
@@ -889,7 +889,7 @@ static void simplifyVarMap(std::map<std::string, std::string> &variables)
         // TODO: 2. handle function-macros too.
 
         std::map<std::string, std::string>::iterator it = variables.find(varValue);
-        while (it != variables.end() && it != i) {
+        while (it != variables.end() && it->first != it->second && it != i) {
             varValue = it->second;
             it = variables.find(varValue);
         }

diff --git a/test/testpreprocessor.cpp b/test/testpreprocessor.cpp
@@ -129,6 +129,7 @@ class TestPreprocessor : public TestFixture {
         TEST_CASE(if_or_2);
 
         TEST_CASE(if_macro_eq_macro); // #3536
+        TEST_CASE(ticket_3675);
 
         TEST_CASE(multiline1);
         TEST_CASE(multiline2);
@@ -1521,6 +1522,23 @@ class TestPreprocessor : public TestFixture {
         ASSERT_EQUALS("\n\n\n\nWilma\n\n\n\n", actual[""]);
     }
 
+    void ticket_3675() {
+        const std::string code("#ifdef YYSTACKSIZE\n"
+                               "#define YYMAXDEPTH YYSTACKSIZE\n"
+                               "#else\n"
+                               "#define YYSTACKSIZE YYMAXDEPTH\n"
+                               "#endif\n"
+                               "#if YYDEBUG\n"
+                               "#endif\n");
+        Settings settings;
+        Preprocessor preprocessor(&settings, this);
+        std::istringstream istr(code);
+        std::map<std::string, std::string> actual;
+        preprocessor.preprocess(istr, actual, "file.c");
+
+        // There's nothing to assert. It just needs to not hang.
+    }
+
     void multiline1() {
         const char filedata[] = "#define str \"abc\"     \\\n"
                                 "            \"def\"       \n"