Partial fix for #11894 FP knownArgument with function pointer

chrchr-github · Aug 24, 2023 · c25f03e · c25f03e
1 parent 5a7c7b9
commit c25f03e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
@@ -635,7 +635,8 @@ static void setTokenValue(Token* tok,
         });
         // Ensure that the comma isn't a function call
         if (!callParent || (!Token::Match(callParent->previous(), "%name%|> (") && !Token::simpleMatch(callParent, "{") &&
-                            (!Token::Match(callParent, "( %name%") || settings->library.isNotLibraryFunction(callParent->next())))) {
+                            (!Token::Match(callParent, "( %name%") || settings->library.isNotLibraryFunction(callParent->next())) &&
+                            !(callParent->str() == "(" && Token::simpleMatch(callParent->astOperand1(), "*")))) {
             setTokenValue(parent, std::move(value), settings);
             return;
         }

diff --git a/test/testvalueflow.cpp b/test/testvalueflow.cpp
@@ -5129,6 +5129,13 @@ class TestValueFlow : public TestFixture {
         value = valueOfTok(code, "1");
         ASSERT_EQUALS(1, value.intvalue);
         ASSERT_EQUALS(false, value.isKnown());
+
+        code = "void f(char c, struct T* t) {\n" // #11894
+               "    (*t->func)(&c, 1, t->ptr);\n"
+               "}\n";
+        value = valueOfTok(code, ", 1");
+        ASSERT_EQUALS(0, value.intvalue);
+        ASSERT_EQUALS(false, value.isKnown());
     }
 
     void valueFlowSizeofForwardDeclaredEnum() {