Merge pull request danmar#168 from simartin/ticket_4994

danmar · danmar · commit 4b1254bc8dca · 2013-09-08T06:57:42.000-07:00
Ticket danmar#4994: Don't crash when checking variable scope for invalid input
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
@@ -2256,8 +2256,11 @@ void Scope::getVariableList()
 
         // skip return and delete
         else if (Token::Match(tok, "return|delete")) {
-            while (tok->next() && tok->next()->str() != ";")
+            while (tok->next() &&
+                   tok->next()->str() != ";" &&
+                   tok->next()->str() != "}" /* ticket #4994 */) {
                 tok = tok->next();
+            }
             continue;
         }
 
diff --git a/test/testother.cpp b/test/testother.cpp
@@ -75,6 +75,7 @@ class TestOther : public TestFixture {
         TEST_CASE(varScope16);
         TEST_CASE(varScope17);
         TEST_CASE(varScope18);
+        TEST_CASE(varScope19);      // Ticket #4994
 
         TEST_CASE(oldStylePointerCast);
         TEST_CASE(invalidPointerCast);
@@ -1081,6 +1082,15 @@ class TestOther : public TestFixture {
         ASSERT_EQUALS("", errout.str());
     }
 
+    void varScope19() { // Ticket #4994
+        varScope("long f () {\n"
+                 "  return a >> extern\n"
+                 "}\n"
+                 "long a = 1 ;\n"
+                 "long b = 2 ;");
+        ASSERT_EQUALS("", errout.str());
+    }
+
     void checkOldStylePointerCast(const char code[]) {
         // Clear the error buffer..
         errout.str("");
