value flow: Fixed wrong value in subfunction after conditional return

danmar · danmar · commit dfee04492576 · 2014-01-08T06:04:51.000+01:00
diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
@@ -182,6 +182,7 @@ static void valueFlowSubFunction(TokenList *tokenlist, ErrorLogger *errorLogger,
 {
     std::list<ValueFlow::Value> argvalues;
     for (Token *tok = tokenlist->front(); tok; tok = tok->next()) {
+        // passing value(s) to function
         if (Token::Match(tok, "[(,] %var% [,)]") && !tok->next()->values.empty())
             argvalues = tok->next()->values;
         else if (Token::Match(tok, "[(,] %num% [,)]")) {
@@ -226,7 +227,7 @@ static void valueFlowSubFunction(TokenList *tokenlist, ErrorLogger *errorLogger,
             } else if (tok2->varId() == varid2 || tok2->str() == "{") {
                 if (settings->debugwarnings)
                     bailout(tokenlist, errorLogger, tok2, "parameter " + arg->nameToken()->str());
-                continue;
+                break;
             }
         }
     }
diff --git a/test/testvalueflow.cpp b/test/testvalueflow.cpp
@@ -136,6 +136,16 @@ class TestValueFlow : public TestFixture {
                "    if (x==0){}\n"
                "}";
         ASSERT_EQUALS(true, testValueOfX(code, 1U, 0));
+
+        code = "void f1(int x) {\n"
+               "    if (x == 0) return;\n"
+               "    int y = 1234 / x;\n"
+               "}\n"
+               "\n"
+               "void f2() {\n"
+               "    f1(0);\n"
+               "}";
+        ASSERT_EQUALS(false, testValueOfX(code, 3U, 0));
     }
 };
 

Original file line number	Diff line number	Diff line change
`@@ -182,6 +182,7 @@ static void valueFlowSubFunction(TokenList tokenlist, ErrorLogger errorLogger,`
`182`	`182`	`{`
`183`	`183`	`std::list<ValueFlow::Value> argvalues;`
`184`	`184`	`for (Token *tok = tokenlist->front(); tok; tok = tok->next()) {`
	`185`	`+ // passing value(s) to function`
`185`	`186`	`if (Token::Match(tok, "[(,] %var% [,)]") && !tok->next()->values.empty())`
`186`	`187`	`argvalues = tok->next()->values;`
`187`	`188`	`else if (Token::Match(tok, "[(,] %num% [,)]")) {`
`@@ -226,7 +227,7 @@ static void valueFlowSubFunction(TokenList tokenlist, ErrorLogger errorLogger,`
`226`	`227`	`} else if (tok2->varId() == varid2 \|\| tok2->str() == "{") {`
`227`	`228`	`if (settings->debugwarnings)`
`228`	`229`	`bailout(tokenlist, errorLogger, tok2, "parameter " + arg->nameToken()->str());`
`229`		`- continue;`
	`230`	`+ break;`
`230`	`231`	`}`
`231`	`232`	`}`
`232`	`233`	`}`