cppcheck-opensource#7182 crash: CheckMemoryLeak::functionReturnType()

amai2012 · amai2012 · commit 86c9387987ec · 2015-12-05T18:43:29.000+01:00
diff --git a/lib/checkmemoryleak.cpp b/lib/checkmemoryleak.cpp
@@ -344,7 +344,8 @@ CheckMemoryLeak::AllocType CheckMemoryLeak::functionReturnType(const Function* f
             const Token* tok = tok2->astOperand1();
             if (Token::Match(tok, ".|::"))
                 tok = tok->astOperand2() ? tok->astOperand2() : tok->astOperand1();
-            varid = tok->varId();
+            if (tok)
+                varid = tok->varId();
             break;
         }
     }
diff --git a/test/testmemleak.cpp b/test/testmemleak.cpp
@@ -5712,6 +5712,14 @@ class TestMemleakNoVar : public TestFixture {
               "    malloc();\n"
               "}");
         ASSERT_EQUALS("", errout.str());
+
+        // #7182 "crash: CheckMemoryLeak::functionReturnType()"
+        check("template<typename... Ts> auto unary_right_comma (Ts... ts) { return (ts , ...); }\n"
+              "template<typename T, typename... Ts> auto binary_left_comma (T x, Ts... ts) { return (x , ... , ts); }\n"
+              "int main() {\n"
+              "  unary_right_comma (a);\n"
+              "}");
+        ASSERT_EQUALS("", errout.str());
     }
 
     void smartPointerFunctionParam() {

Original file line number	Diff line number	Diff line change
`@@ -344,7 +344,8 @@ CheckMemoryLeak::AllocType CheckMemoryLeak::functionReturnType(const Function* f`
`344`	`344`	`const Token* tok = tok2->astOperand1();`
`345`	`345`	`if (Token::Match(tok, ".\|::"))`
`346`	`346`	`tok = tok->astOperand2() ? tok->astOperand2() : tok->astOperand1();`
`347`		`- varid = tok->varId();`
	`347`	`+ if (tok)`
	`348`	`+ varid = tok->varId();`
`348`	`349`	`break;`
`349`	`350`	`}`
`350`	`351`	`}`