Fix endless recursion within CheckClass::isConstMemberFunc() caused by incomplete/missing template declaration

amai2012 · amai2012 · commit 70885c78e448 · 2014-03-30T10:09:57.000+02:00
diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp
@@ -1737,7 +1737,7 @@ bool CheckClass::isConstMemberFunc(const Scope *scope, const Token *tok) const
             const Type *derivedFrom = scope->definedType->derivedFrom[i].type;
 
             // find the function in the base class
-            if (derivedFrom && derivedFrom->classScope) {
+            if (derivedFrom && derivedFrom->classScope && !derivedFrom->hasCircularDependencies()) {
                 if (isConstMemberFunc(derivedFrom->classScope, tok))
                     return true;
             }
diff --git a/test/testclass.cpp b/test/testclass.cpp
@@ -4808,6 +4808,25 @@ class TestClass : public TestFixture {
                    "    }\n"
                    "};");
         ASSERT_EQUALS("[test.cpp:2]: (performance, inconclusive) Technically the member function 'MixerParticipant::InitializeFileReader' can be static.\n", errout.str());
+
+        // Based on an example from SVN source code causing an endless recursion within CheckClass::isConstMemberFunc()
+        // A more complete example including a template declaration like
+        //     template<typename K> class Hash{/* ... */};
+        // didn't .
+        checkConst("template<>\n"
+                   "class Hash<void> {\n"
+                   "protected:\n"
+                   "  typedef Key::key_type key_type;\n"
+                   "  void set(const Key& key);\n"
+                   "};\n"
+                   "template<typename K, int KeySize>\n"
+                   "class Hash : private Hash<void> {\n"
+                   "  typedef Hash<void> inherited;\n"
+                   "  void set(const Key& key) {\n"
+                   "      inherited::set(inherited::Key(key));\n"
+                   "  }\n"
+                   "};\n");
+        ASSERT_EQUALS("", errout.str());
     }
 
 

Original file line number	Diff line number	Diff line change
`@@ -1737,7 +1737,7 @@ bool CheckClass::isConstMemberFunc(const Scope scope, const Token tok) const`
`1737`	`1737`	`const Type *derivedFrom = scope->definedType->derivedFrom[i].type;`
`1738`	`1738`
`1739`	`1739`	`// find the function in the base class`
`1740`		`- if (derivedFrom && derivedFrom->classScope) {`
	`1740`	`+ if (derivedFrom && derivedFrom->classScope && !derivedFrom->hasCircularDependencies()) {`
`1741`	`1741`	`if (isConstMemberFunc(derivedFrom->classScope, tok))`
`1742`	`1742`	`return true;`
`1743`	`1743`	`}`