fix hang from f48e195 (fix #10136 TODO test (cppcheck-opensource#3117)) (cppcheck-opensource#3120)

IOBYTE · Robert Reif · web-flow · commit d3d2e16137dc · 2021-02-09T14:19:01.000+01:00
Co-authored-by: Robert Reif &lt;reif@FX6840&gt;
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -1812,7 +1812,7 @@ namespace {
             const ScopeInfo3 * tempScope = this;
             while (tempScope) {
                 for (const auto & child : tempScope->children) {
-                    if (child.name == scope || child.fullName == scope)
+                    if (child.type == Record && (child.name == scope || child.fullName == scope))
                         return &child;
                 }
 
diff --git a/test/testsimplifyusing.cpp b/test/testsimplifyusing.cpp
@@ -974,6 +974,33 @@ class TestSimplifyUsing : public TestFixture {
             ASSERT_EQUALS(exp, tok(code, true));
             ASSERT_EQUALS("", errout.str());
         }
+        {
+            const char code[] = "foo::ResultCodes_e\n"
+                                "GemImpl::setR(const ::foo::s _ipSource)\n"
+                                "{\n"
+                                "   M3_LOG_EE_DEBUG();\n"
+                                "   using MLSource = foo::s::Literal;\n"
+                                "   auto ret = foo::ResultCodes_e::NO_ERROR;\n"
+                                "   M3_LOG_INFO(\"foo(\" << static_cast<int>(_ipSource) << \")\");\n"
+                                "   return ret;\n"
+                                "}\n"
+                                "foo::ResultCodes_e\n"
+                                "GemImpl::getF(::foo::s &_ipSource)\n"
+                                "{\n"
+                                "   M3_LOG_EE_DEBUG();\n"
+                                "   auto ret = foo::ResultCodes_e::NO_ERROR;\n"
+                                "   return ret;\n"
+                                "}\n"
+                                "foo::ResultCodes_e\n"
+                                "GemImpl::setF(const ::foo::s _ipSource)\n"
+                                "{\n"
+                                "   M3_LOG_EE_DEBUG();\n"
+                                "   using MLSource = foo::s::Literal;\n"
+                                "   auto ret = foo::ResultCodes_e::NO_ERROR;\n"
+                                "   return ret;\n"
+                                "}";
+            tok(code, true); // don't crash
+        }
     }
 
     void simplifyUsing10171() {

Original file line number	Diff line number	Diff line change
`@@ -1812,7 +1812,7 @@ namespace {`
`1812`	`1812`	`const ScopeInfo3 * tempScope = this;`
`1813`	`1813`	`while (tempScope) {`
`1814`	`1814`	`for (const auto & child : tempScope->children) {`
`1815`		`- if (child.name == scope \|\| child.fullName == scope)`
	`1815`	`+ if (child.type == Record && (child.name == scope \|\| child.fullName == scope))`
`1816`	`1816`	`return &child;`
`1817`	`1817`	`}`
`1818`	`1818`