Fixed danmar#1048 (False positive: exceptNew error with nothrow)

Daniel Marjam&auml;ki · Daniel Marjam&auml;ki · commit da4d03f6c416 · 2009-12-05T22:05:59.000+01:00
diff --git a/lib/checkexceptionsafety.cpp b/lib/checkexceptionsafety.cpp
@@ -183,7 +183,7 @@ void CheckExceptionSafety::unsafeNew()
                 localVars.insert(tok->varId());
         }
 
-        if (Token::Match(tok, "; %var% = new"))
+        if (Token::Match(tok, "; %var% = new %type%"))
         {
             if (!varname.empty())
             {
@@ -221,7 +221,7 @@ void CheckExceptionSafety::realloc()
             break;
 
         // reallocating..
-        if (!Token::Match(tok, "%var% ; %var% = new"))
+        if (!Token::Match(tok, "%var% ; %var% = new %type%"))
             continue;
 
         // variable id of deallocated pointer..
diff --git a/test/testexceptionsafety.cpp b/test/testexceptionsafety.cpp
@@ -90,6 +90,13 @@ class TestExceptionSafety : public TestFixture
               "    A *a2 = new A;\n"
               "}\n");
         ASSERT_EQUALS("[test.cpp:4]: (style) Upon exception there is memory leak: a1\n", errout.str());
+
+        check("void a()\n"
+              "{\n"
+              "    A *a1 = new A;\n"
+              "    A *a2 = new (std::nothrow) A;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout.str());
     }
 
     void realloc()
@@ -100,19 +107,30 @@ class TestExceptionSafety : public TestFixture
               "    void a()\n"
               "    {\n"
               "        delete p;\n"
-              "        p = new[123];\n"
+              "        p = new int[123];\n"
               "    }\n"
               "}\n");
         ASSERT_EQUALS("[test.cpp:7]: (style) Upon exception p becomes a dead pointer\n", errout.str());
 
+        check("class A\n"
+              "{\n"
+              "    int *p;\n"
+              "    void a()\n"
+              "    {\n"
+              "        delete p;\n"
+              "        p = new (std::nothrow) int[123];\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout.str());
+
         check("class A\n"
               "{\n"
               "    int *p;\n"
               "    void a()\n"
               "    {\n"
               "        try {\n"
               "            delete p;\n"
-              "            p = new[123];\n"
+              "            p = new int[123];\n"
               "        } catch (...) { p = 0; }\n"
               "    }\n"
               "}\n");

Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ void CheckExceptionSafety::unsafeNew()`
`183`	`183`	`localVars.insert(tok->varId());`
`184`	`184`	`}`
`185`	`185`
`186`		`- if (Token::Match(tok, "; %var% = new"))`
	`186`	`+ if (Token::Match(tok, "; %var% = new %type%"))`
`187`	`187`	`{`
`188`	`188`	`if (!varname.empty())`
`189`	`189`	`{`
`@@ -221,7 +221,7 @@ void CheckExceptionSafety::realloc()`
`221`	`221`	`break;`
`222`	`222`
`223`	`223`	`// reallocating..`
`224`		`- if (!Token::Match(tok, "%var% ; %var% = new"))`
	`224`	`+ if (!Token::Match(tok, "%var% ; %var% = new %type%"))`
`225`	`225`	`continue;`
`226`	`226`
`227`	`227`	`// variable id of deallocated pointer..`