Fix #11644 Tokenizer: garbage code '(sizeof=)' (#6166)

danmar · Mar 22, 2024 · 7dfbb65 · 7dfbb65
1 parent 6e6b203
commit 7dfbb65
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -8583,9 +8583,12 @@ void Tokenizer::findGarbageCode() const
             bool match1 = Token::Match(tok, "%or%|%oror%|==|!=|+|-|/|!|>=|<=|~|^|++|--|::|sizeof");
             bool match2 = Token::Match(tok->next(), "{|if|else|while|do|for|return|switch|break");
             if (isCPP()) {
-                match1 = match1 || Token::Match(tok, "::|throw|decltype|typeof");
+                match1 = match1 || Token::Match(tok, "throw|decltype|typeof");
                 match2 = match2 || Token::Match(tok->next(), "try|catch|namespace");
             }
+            if (match1 && !tok->isIncDecOp()) {
+                match2 = match2 || Token::Match(tok->next(), "%assign%");
+            }
             if (match1 && match2)
                 syntaxError(tok);
         }

diff --git a/test/testgarbage.cpp b/test/testgarbage.cpp
@@ -253,6 +253,7 @@ class TestGarbage : public TestFixture {
         TEST_CASE(garbageCode222); // #10763
         TEST_CASE(garbageCode223); // #11639
         TEST_CASE(garbageCode224);
+        TEST_CASE(garbageCode225);
 
         TEST_CASE(garbageCodeFuzzerClientMode1); // test cases created with the fuzzer client, mode 1
 
@@ -1746,6 +1747,10 @@ class TestGarbage : public TestFixture {
         checkCode("void f(){ auto* b = dynamic_cast<const }");  // don't crash
         (void)errout_str(); // we are not interested in the output
     }
+    void garbageCode225() {
+        ASSERT_THROW(checkCode("int n() { c * s0, 0 s0 = c(sizeof = ) }"), InternalError);
+        ASSERT_THROW(checkCode("int n() { c * s0, 0 s0 = c(sizeof |= ) }"), InternalError);
+    }
 
     void syntaxErrorFirstToken() {
         ASSERT_THROW(checkCode("&operator(){[]};"), InternalError); // #7818

diff --git a/test/testunusedvar.cpp b/test/testunusedvar.cpp
@@ -6794,7 +6794,7 @@ class TestUnusedVar : public TestFixture {
                               "  int a = 0;\n"
                               "  do {\n"
                               "    dostuff(a);\n"
-                              "  } while((a + = x) < 30);\n"
+                              "  } while((a += x) < 30);\n"
                               "}");
         ASSERT_EQUALS("", errout_str());