Fix #12569 internalAstError with scope operator (#6226)

danmar · Apr 4, 2024 · 35a7eb9 · 35a7eb9
1 parent 57f9e04
commit 35a7eb9
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/lib/tokenlist.cpp b/lib/tokenlist.cpp
@@ -1738,6 +1738,8 @@ static Token * createAstAtToken(Token *tok)
         AST_state state(cpp);
         if (Token::Match(tok, "%name% ("))
             state.functionCallEndPar = tok->linkAt(1);
+        if (Token::simpleMatch(tok->tokAt(-1), "::") && (!tok->tokAt(-2) || !tok->tokAt(-2)->isName()))
+            tok = tok->tokAt(-1);
         compileExpression(tok, state);
         Token * const endToken = tok;
         if (endToken == tok1 || !endToken)
@@ -1760,11 +1762,6 @@ static Token * createAstAtToken(Token *tok)
         return endToken->previous();
     }
 
-    if (cpp && ((!tok->previous() && tok->str() == "::") || Token::Match(tok->previous(), "[;{}] ::"))) {
-        AST_state state(cpp);
-        compileExpression(tok, state);
-    }
-
     return tok;
 }
 

diff --git a/test/testleakautovar.cpp b/test/testleakautovar.cpp
@@ -2480,6 +2480,14 @@ class TestLeakAutoVar : public TestFixture {
               "  std::shared_ptr<C> a{c, [](C* x) { delete x; }};\n"
               "}", true);
         ASSERT_EQUALS("", errout_str());
+
+        check("struct DirDeleter {\n" // #12544
+              "    void operator()(DIR* d) { ::closedir(d); }\n"
+              "};\n"
+              "void openDir(DIR* dir) {\n"
+              "    std::shared_ptr<DIR> dp(dir, DirDeleter());\n"
+              "}\n", true);
+        ASSERT_EQUALS("[test.cpp:2]: (information) --check-library: Function closedir() should have <noreturn> configuration\n", errout_str()); // don't crash
     }
     void smartPointerRelease() {
         check("void f() {\n"

diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
@@ -6218,6 +6218,13 @@ class TestTokenizer : public TestFixture {
                "        (kInput & (uint64_t(1) << 63)) ? 63 : 64;\n"
                "};\n";
         ASSERT_NO_THROW(tokenizeAndStringify(code));
+
+        code = "void f(const std::vector<int>& v) {\n" // #12569
+               "    ::std::for_each(v.begin(), v.end(), [](int i) {\n"
+               "        int j(i ? i : 5);\n"
+               "    });\n"
+               "}\n";
+        ASSERT_NO_THROW(tokenizeAndStringify(code));
     }
 
     void astnewdelete() const {