Fix #12843 FP constParameterPointer (function pointer not set) (#6528)

danmar · Jun 15, 2024 · 3c772a4 · 3c772a4
1 parent 1be5af7
commit 3c772a4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
@@ -1152,7 +1152,7 @@ void SymbolDatabase::createSymbolDatabaseSetFunctionPointers(bool firstPass)
             inTemplateArg = tok->link();
         if (inTemplateArg == tok)
             inTemplateArg = nullptr;
-        if (tok->isName() && !tok->function() && tok->varId() == 0 && ((tok->astParent() && tok->astParent()->isComparisonOp()) || Token::Match(tok, "%name% [{(,)>;]")) && !isReservedName(tok)) {
+        if (tok->isName() && !tok->function() && tok->varId() == 0 && ((tok->astParent() && tok->astParent()->isComparisonOp()) || Token::Match(tok, "%name% [{(,)>;]]")) && !isReservedName(tok)) {
             if (tok->strAt(1) == ">" && !tok->linkAt(1))
                 continue;
 

diff --git a/test/testother.cpp b/test/testother.cpp
@@ -3647,6 +3647,14 @@ class TestOther : public TestFixture {
               "    switch (signal.signum) {}\n"
               "}");
         ASSERT_EQUALS("[test.cpp:10] -> [test.cpp:13]: (style) Parameter 'signal' can be declared as reference to const. However it seems that 'signalEvent' is a callback function, if 'signal' is declared with const you might also need to cast function pointer(s).\n", errout_str());
+
+        check("void f(int* p) {}\n" // 12843
+              "void g(std::map<void(*)(int*), int>&m) {\n"
+              "    m[&f] = 0;\n"
+              "}");
+        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:1]: (style) Parameter 'p' can be declared as pointer to const. "
+                      "However it seems that 'f' is a callback function, if 'p' is declared with const you might also need to cast function pointer(s).\n",
+                      errout_str());
     }
 
     void constPointer() {