Fixed crash on invalid code danmar#6080

PKEuS · PKEuS · commit 0dc4b7556563 · 2014-08-23T12:36:42.000+02:00
diff --git a/lib/checkexceptionsafety.cpp b/lib/checkexceptionsafety.cpp
@@ -93,7 +93,7 @@ void CheckExceptionSafety::deallocThrow()
             tok = tok->next();
             if (Token::simpleMatch(tok, "[ ]"))
                 tok = tok->tokAt(2);
-            if (!tok)
+            if (!tok || tok == scope->classEnd)
                 break;
             if (!Token::Match(tok, "%var% ;"))
                 continue;
diff --git a/test/testexceptionsafety.cpp b/test/testexceptionsafety.cpp
@@ -49,6 +49,8 @@ class TestExceptionSafety : public TestFixture {
         TEST_CASE(nothrowAttributeThrow);
         TEST_CASE(nothrowAttributeThrow2); // #5703
         TEST_CASE(nothrowDeclspecThrow);
+
+        TEST_CASE(garbage);
     }
 
     void check(const char code[], bool inconclusive = false) {
@@ -411,6 +413,10 @@ class TestExceptionSafety : public TestFixture {
         check("const char *func() __attribute((nothrow)); void func1() { return 0; }\n");
         ASSERT_EQUALS("", errout.str());
     }
+
+    void garbage() {
+        check("{ } A() { delete }"); // #6080
+    }
 };
 
 REGISTER_TEST(TestExceptionSafety)
