Fixed crash in CheckMemoryLeak::functionReturnType() for unary operator:: (cppcheck-opensource#7172)

PKEuS · PKEuS · commit 3b4160600de7 · 2015-11-27T11:18:40.000+01:00
diff --git a/lib/checkmemoryleak.cpp b/lib/checkmemoryleak.cpp
@@ -343,7 +343,7 @@ CheckMemoryLeak::AllocType CheckMemoryLeak::functionReturnType(const Function* f
                 return No;
             const Token* tok = tok2->astOperand1();
             if (Token::Match(tok, ".|::"))
-                tok = tok->astOperand2();
+                tok = tok->astOperand2() ? tok->astOperand2() : tok->astOperand1();
             varid = tok->varId();
             break;
         }
diff --git a/test/testmemleak.cpp b/test/testmemleak.cpp
@@ -362,6 +362,7 @@ class TestMemleakInFunction : public TestFixture {
 
         TEST_CASE(gnucfg);
         TEST_CASE(trac3991);
+        TEST_CASE(crash);
     }
 
     std::string getcode(const char code[], const char varname[], bool classfunc=false) {
@@ -3893,6 +3894,24 @@ class TestMemleakInFunction : public TestFixture {
               "}", true);
         ASSERT_EQUALS("", errout.str());
     }
+
+    void crash() {
+        check("class ComponentDC {\n"
+              "    ::Component * getComponent();\n"
+              "};\n"
+              "::Component * ComponentDC::getComponent() {\n"
+              "    return ((::Component *)myComponent);\n"
+              "}\n"
+              "class  MultiComponentDC : public ComponentDC {\n"
+              "    virtual void addChild(InterfaceNode *);\n"
+              "};\n"
+              "void MultiComponentDC::addChild(InterfaceNode *childNode) {\n"
+              "    ComponentDC *cdc = dynamic_cast<ComponentDC *>(childNode);\n"
+              "    if (cdc)\n"
+              "        ::Component *c = cdc->getComponent();\n"
+              "}");
+        ASSERT_EQUALS("", errout.str());
+    }
 };
 
 REGISTER_TEST(TestMemleakInFunction)

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