Fixed cppcheck-opensource#5826 (Change error message for 'throw in destructor' check)

danmar · danmar · commit af2b94e32277 · 2014-07-19T03:29:50.000+02:00
diff --git a/lib/checkexceptionsafety.cpp b/lib/checkexceptionsafety.cpp
@@ -32,6 +32,9 @@ namespace {
 
 void CheckExceptionSafety::destructors()
 {
+    if (!_settings->isEnabled("warning"))
+        return;
+
     const SymbolDatabase* const symbolDatabase = _tokenizer->getSymbolDatabase();
 
     // Perform check..
@@ -57,7 +60,7 @@ void CheckExceptionSafety::destructors()
 
                     // throw found within a destructor
                     if (tok->str() == "throw") {
-                        destructorsError(tok);
+                        destructorsError(tok, scope->className);
                         break;
                     }
                 }
diff --git a/lib/checkexceptionsafety.h b/lib/checkexceptionsafety.h
@@ -82,8 +82,12 @@ class CPPCHECKLIB CheckExceptionSafety : public Check {
 
 private:
     /** Don't throw exceptions in destructors */
-    void destructorsError(const Token * const tok) {
-        reportError(tok, Severity::error, "exceptThrowInDestructor", "Exception thrown in destructor.");
+    void destructorsError(const Token * const tok, const std::string &className) {
+        reportError(tok, Severity::warning, "exceptThrowInDestructor",
+                    "Class " + className + " is not safe, destructor throws exception\n"
+                    "The class " + className + " is not safe because its destructor "
+                    "throws an exception. If " + className + " is used and an exception "
+                    "is thrown that is caught in an outer scope the program will terminate.");
     }
 
     void deallocThrowError(const Token * const tok, const std::string &varname) {
@@ -140,7 +144,7 @@ class CPPCHECKLIB CheckExceptionSafety : public Check {
     /** Generate all possible errors (for --errorlist) */
     void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const {
         CheckExceptionSafety c(0, settings, errorLogger);
-        c.destructorsError(0);
+        c.destructorsError(0, "Class");
         c.deallocThrowError(0, "p");
         c.rethrowCopyError(0, "varname");
         c.catchExceptionByValueError(0);
diff --git a/test/testexceptionsafety.cpp b/test/testexceptionsafety.cpp
@@ -75,20 +75,20 @@ class TestExceptionSafety : public TestFixture {
               "        throw e;\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Exception thrown in destructor.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3]: (warning) Class x is not safe, destructor throws exception\n", errout.str());
 
         check("class x {\n"
               "    ~x();\n"
               "};\n"
               "x::~x() {\n"
               "    throw e;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Exception thrown in destructor.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5]: (warning) Class x is not safe, destructor throws exception\n", errout.str());
 
         check("x::~x() {\n"
               "    throw e;\n"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:3]: (error) Exception thrown in destructor.\n", "", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:3]: (warning) Class x is not safe, destructor throws exception\n", "", errout.str());
 
         // #3858 - throwing exception in try block in destructor.
         check("class x {\n"

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,9 @@ namespace {`
`32`	`32`
`33`	`33`	`void CheckExceptionSafety::destructors()`
`34`	`34`	`{`
	`35`	`+ if (!_settings->isEnabled("warning"))`
	`36`	`+ return;`
	`37`	`+`
`35`	`38`	`const SymbolDatabase* const symbolDatabase = _tokenizer->getSymbolDatabase();`
`36`	`39`
`37`	`40`	`// Perform check..`
`@@ -57,7 +60,7 @@ void CheckExceptionSafety::destructors()`
`57`	`60`
`58`	`61`	`// throw found within a destructor`
`59`	`62`	`if (tok->str() == "throw") {`
`60`		`- destructorsError(tok);`
	`63`	`+ destructorsError(tok, scope->className);`
`61`	`64`	`break;`
`62`	`65`	`}`
`63`	`66`	`}`