Reject invalid code after if/switch/loop (also fixes #14326) (#8033)

Co-authored-by: chrchr-github <[email protected]>

Author: chrchr-github

lib/tokenize.cpp

@@ -8672,6 +8672,9 @@ void Tokenizer::findGarbageCode() const
                 }
                 if (!Token::Match(tok->next(), "( !!)"))
                     syntaxError(tok);
+                if (Token::simpleMatch(tok->linkAt(1), ") }")) {
+                    syntaxError(tok->linkAt(1)->next());
+                }
                 if (tok->str() != "for") {
                     if (isGarbageExpr(tok->next(), tok->linkAt(1), cpp && (mSettings.standards.cpp>=Standards::cppstd_t::CPP17)))
                         syntaxError(tok);

test/testcondition.cpp

@@ -771,13 +771,13 @@ class TestCondition : public TestFixture {
 
         check("void f(size_t x) {\n"
               "    if (x == sizeof(int)) {}\n"
-              "    else { if (x == sizeof(long))} {}\n"
+              "    else { if (x == sizeof(long)) {} }\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(size_t x) {\n"
               "    if (x == sizeof(long)) {}\n"
-              "    else { if (x == sizeof(long long))} {}\n"
+              "    else { if (x == sizeof(long long)) {} }\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
     }

test/testgarbage.cpp

@@ -883,8 +883,7 @@ class TestGarbage : public TestFixture {
     }
 
     void garbageCode102() { // #6846 (segmentation fault)
-        (void)checkCode("struct Object { ( ) ; Object & operator= ( Object ) { ( ) { } if ( this != & b ) } }");
-        ignore_errout(); // we do not care about the output
+        ASSERT_THROW_INTERNAL(checkCode("struct Object { ( ) ; Object & operator= ( Object ) { ( ) { } if ( this != & b ) } }"), SYNTAX);
     }
 
     void garbageCode103() { // #6824
@@ -1251,8 +1250,7 @@ class TestGarbage : public TestFixture {
         const char code[] = "template <bool foo = std::value &&>\n"
                             "static std::string foo(char *Bla) {\n"
                             "    while (Bla[1] && Bla[1] != ',') }\n";
-        (void)checkCode(code);
-        ignore_errout(); // we are not interested in the output
+        ASSERT_THROW_INTERNAL(checkCode(code), SYNTAX);
     }
 
     void garbageCode153() {

test/testsymboldatabase.cpp

@@ -3674,8 +3674,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void symboldatabase36() { // ticket #4892
-        check("void struct ( ) { if ( 1 ) } int main ( ) { }");
-        ASSERT_EQUALS("", errout_str());
+        ASSERT_THROW_INTERNAL(check("void struct ( ) { if ( 1 ) } int main ( ) { }"), SYNTAX);
     }
 
     void symboldatabase37() {

test/testtokenize.cpp

@@ -5365,8 +5365,8 @@ class TestTokenizer : public TestFixture {
         ASSERT_EQUALS("; x = 123 ;", tokenizeAndStringify(";x=({123;});"));
         ASSERT_EQUALS("; x = y ;", tokenizeAndStringify(";x=({y;});"));
         // #13419: Do not simplify compound statements in for loop
-        ASSERT_EQUALS("void foo ( int x ) { for ( ; ( { { } ; x < 1 ; } ) ; ) }",
-                      tokenizeAndStringify("void foo(int x) { for (;({ {}; x<1; });) }"));
+        ASSERT_EQUALS("void foo ( int x ) { for ( ; ( { { } ; x < 1 ; } ) ; ) { ; } }",
+                      tokenizeAndStringify("void foo(int x) { for (;({ {}; x<1; });); }"));
     }
 
     void simplifyOperatorName1() {
@@ -7647,6 +7647,11 @@ class TestTokenizer : public TestFixture {
 
         ASSERT_THROW_INTERNAL(tokenizeAndStringify("{ for (()()) }"), SYNTAX); // #11643
 
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void f(const std::vector<std::string>& v) {\n" // #14326
+                                                   "    for (const std::string&s : v)\n"
+                                                   "}"),
+                              SYNTAX);
+
         ASSERT_NO_THROW(tokenizeAndStringify("S* g = ::new(ptr) S();")); // #12552
         ASSERT_NO_THROW(tokenizeAndStringify("void f(int* p) { return ::delete p; }"));