Fixed crash in CheckVaarg::va_start_argument (danmar#6032)

PKEuS · PKEuS · commit 076c1bd06c01 · 2014-08-06T19:35:09.000+02:00
diff --git a/lib/checkvaarg.cpp b/lib/checkvaarg.cpp
@@ -44,7 +44,7 @@ void CheckVaarg::va_start_argument()
                 const Variable* var = param2->variable();
                 if (var && var->isReference())
                     referenceAs_va_start_error(param2, var->name());
-                if (var->index() + 2 < function->argCount() && _settings->isEnabled("warning")) {
+                if (var && var->index() + 2 < function->argCount() && _settings->isEnabled("warning")) {
                     std::list<Variable>::const_reverse_iterator it = function->argumentList.rbegin();
                     ++it;
                     wrongParameterTo_va_start_error(tok, var->name(), it->name());
diff --git a/test/testvaarg.cpp b/test/testvaarg.cpp
@@ -74,6 +74,15 @@ class TestVaarg : public TestFixture {
               "    va_end(arg_ptr);\n"
               "}");
         ASSERT_EQUALS("", errout.str());
+
+        check("int main(int argc, char *argv[]) {\n"
+              "    long(^addthem)(const char *, ...) = ^long(const char *format, ...) {\n"
+              "        va_list argp;\n"
+              "        va_start(argp, format);\n"
+              "        c = va_arg(argp, int);\n"
+              "    };\n"
+              "}"); // Don't crash (#6032)
+        ASSERT_EQUALS("[test.cpp:6]: (error) va_list 'argp' was opened but not closed by va_end().\n", errout.str());
     }
 
     void referenceAs_va_start() {
