Fix #12544 Crash in getDeallocFuncInfo() (cppcheck-opensource#6187)

chrchr-github · web-flow · commit 82f05c8d9693 · 2024-03-25T22:58:58.000+01:00
diff --git a/lib/tokenlist.cpp b/lib/tokenlist.cpp
@@ -1752,6 +1752,11 @@ 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/testfunctions.cpp b/test/testfunctions.cpp
@@ -411,7 +411,7 @@ class TestFunctions : public TestFixture {
               "{\n"
               "    ::getpwent();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Return value of function getpwent() is not used.\n"
+        ASSERT_EQUALS("[test.cpp:3]: (warning) Return value of function ::getpwent() is not used.\n"
                       "[test.cpp:3]: (portability) Non reentrant function 'getpwent' called. For threadsafe applications it is recommended to use the reentrant replacement function 'getpwent_r'.\n", errout_str());
 
         // Be quiet on function definitions
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
@@ -6541,6 +6541,7 @@ class TestTokenizer : public TestFixture {
         ASSERT_EQUALS("PT.(", testAst("P->~T();"));  // <- The "T" token::function() will be a destructor
         ASSERT_EQUALS("double&(4[", testAst("void f(double(&)[4]) {}"));
         ASSERT_EQUALS("voidu*", testAst("int* g ( void* (f) (void*), void* u);")); // #12475
+        ASSERT_EQUALS("f::(", testAst("::f();")); // #12544
     }
 
     void asttemplate() { // uninstantiated templates will have <,>,etc..

Original file line number	Diff line number	Diff line change
`@@ -1752,6 +1752,11 @@ static Token * createAstAtToken(Token *tok)`
`1752`	`1752`	`return endToken->previous();`
`1753`	`1753`	`}`
`1754`	`1754`
	`1755`	`+ if (cpp && ((!tok->previous() && tok->str() == "::") \|\| Token::Match(tok->previous(), "[;{}] ::"))) {`
	`1756`	`+ AST_state state(cpp);`
	`1757`	`+ compileExpression(tok, state);`
	`1758`	`+ }`
	`1759`	`+`
`1755`	`1760`	`return tok;`
`1756`	`1761`	`}`
`1757`	`1762`
Original file line number	Diff line number	Diff line change
`@@ -6541,6 +6541,7 @@ class TestTokenizer : public TestFixture {`
`6541`	`6541`	`ASSERT_EQUALS("PT.(", testAst("P->~T();")); // <- The "T" token::function() will be a destructor`
`6542`	`6542`	`ASSERT_EQUALS("double&(4[", testAst("void f(double(&)[4]) {}"));`
`6543`	`6543`	`ASSERT_EQUALS("voidu", testAst("int g ( void* (f) (void), void u);")); // #12475`
	`6544`	`+ ASSERT_EQUALS("f::(", testAst("::f();")); // #12544`
`6544`	`6545`	`}`
`6545`	`6546`
`6546`	`6547`	`void asttemplate() { // uninstantiated templates will have <,>,etc..`