CheckVaarg::va_list_usage(): Bailout when try{} block is encountered (cppcheck-opensource#6186)

PKEuS · PKEuS · commit 812bc6bdaf9b · 2014-09-27T11:03:58.000+02:00
diff --git a/lib/checkvaarg.cpp b/lib/checkvaarg.cpp
@@ -114,7 +114,10 @@ void CheckVaarg::va_list_usage()
                 tok = tok->linkAt(1);
             } else if (Token::Match(tok, "throw|return"))
                 exitOnEndOfStatement = true;
-            else if (!open && tok->varId() == var->declarationId())
+            else if (_tokenizer->isCPP() && tok->str() == "try") {
+                open = false;
+                break;
+            } else if (!open && tok->varId() == var->declarationId())
                 va_list_usedBeforeStartedError(tok, var->name());
             else if (exitOnEndOfStatement && tok->str() == ";")
                 break;
diff --git a/test/testvaarg.cpp b/test/testvaarg.cpp
@@ -116,6 +116,18 @@ class TestVaarg : public TestFixture {
               "}");
         ASSERT_EQUALS("", errout.str());
 
+        // #6186
+        check("void Format(char* szFormat, char (*szBuffer)[_Size], ...) {\n"
+              "    va_list arg_ptr;\n"
+              "    va_start(arg_ptr, szBuffer);\n"
+              "    try {\n"
+              "        throw sth;\n"
+              "    } catch(...) {\n"
+              "        va_end(arg_ptr);\n"
+              "    }\n"
+              "}");
+        ASSERT_EQUALS("", errout.str());
+
         check("void Format(char* szFormat, char (*szBuffer)[_Size], ...) {\n"
               "    va_list arg_ptr;\n"
               "    va_start(arg_ptr, szBuffer);\n"
