Fixed false positive va_list_usedBeforeStarted (danmar#7527)

PKEuS · PKEuS · commit 9a61559eca34 · 2016-06-02T09:32:45.000+02:00
diff --git a/lib/checkvaarg.cpp b/lib/checkvaarg.cpp
@@ -122,7 +122,7 @@ void CheckVaarg::va_list_usage()
                 }
                 open = nopen;
                 tok = tok->linkAt(1);
-            } else if (Token::Match(tok, "throw|return"))
+            } else if (Token::Match(tok, "throw|return|break"))
                 exitOnEndOfStatement = true;
             else if (_tokenizer->isCPP() && tok->str() == "try") {
                 open = false;
diff --git a/test/testvaarg.cpp b/test/testvaarg.cpp
@@ -200,6 +200,22 @@ class TestVaarg : public TestFixture {
               "    va_end(v2);\n"
               "}");
         ASSERT_EQUALS("", errout.str());
+
+        // #7527
+        check("void foo(int flag1, int flag2, ...) {\n"
+              "    switch (flag1) {\n"
+              "    default:\n"
+              "        va_list vargs;\n"
+              "        va_start(vargs, flag2);\n"
+              "        if (flag2) {\n"
+              "            va_end(vargs);\n"
+              "            break;\n"
+              "        }\n"
+              "        int data = va_arg(vargs, int);\n"
+              "        va_end(vargs);\n"
+              "    }\n"
+              "}");
+        ASSERT_EQUALS("", errout.str());
     }
 
     void va_start_subsequentCalls() {

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ void CheckVaarg::va_list_usage()`
`122`	`122`	`}`
`123`	`123`	`open = nopen;`
`124`	`124`	`tok = tok->linkAt(1);`
`125`		`- } else if (Token::Match(tok, "throw\|return"))`
	`125`	`+ } else if (Token::Match(tok, "throw\|return\|break"))`
`126`	`126`	`exitOnEndOfStatement = true;`
`127`	`127`	`else if (_tokenizer->isCPP() && tok->str() == "try") {`
`128`	`128`	`open = false;`