Fixed cppcheck-opensource#3858 (Throw exception in destructor BUT inside a try-catch shouldn't be reported)

danmar · danmar · commit a37c3144edf0 · 2012-06-17T14:33:18.000+02:00
diff --git a/lib/checkexceptionsafety.cpp b/lib/checkexceptionsafety.cpp
@@ -42,6 +42,11 @@ void CheckExceptionSafety::destructors()
             if (j->type == Function::eDestructor && j->functionScope) {
                 // Inspect this destructor..
                 for (const Token *tok = j->functionScope->classStart->next(); tok != j->functionScope->classEnd; tok = tok->next()) {
+                    // Skip try blocks
+                    if (Token::simpleMatch(tok, "try {")) {
+                        tok = tok->next()->link();
+                    }
+
                     // throw found within a destructor
                     if (tok->str() == "throw") {
                         destructorsError(tok);
diff --git a/test/testexceptionsafety.cpp b/test/testexceptionsafety.cpp
@@ -82,6 +82,17 @@ class TestExceptionSafety : public TestFixture {
               "    throw e;\n"
               "}");
         TODO_ASSERT_EQUALS("[test.cpp:3]: (error) Throwing exception in destructor\n", "", errout.str());
+
+        // #3858 - throwing exception in try block in destructor
+        check("class x {\n"
+              "    ~x() {\n"
+              "        try {\n"
+              "            throw e;\n"
+              "        } catch (...) {\n"
+              "        }\n"
+              "    }\n"
+              "}");
+        ASSERT_EQUALS("", errout.str());
     }
 
     void deallocThrow1() {
