From 52499ca8f82d4ac0d234bfcce0c8a30fd1a364c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <danielm77@spray.se>
Date: Thu, 19 May 2011 19:41:18 +0200
Subject: [PATCH] Fixed #2790 (Incorrect allocation mismatch error)

---
 lib/checkmemoryleak.cpp |  3 +++
 test/testmemleak.cpp    | 12 ++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/lib/checkmemoryleak.cpp b/lib/checkmemoryleak.cpp
index ebe654bad..4a5664047 100644
--- a/lib/checkmemoryleak.cpp
+++ b/lib/checkmemoryleak.cpp
@@ -1047,6 +1047,9 @@ Token *CheckMemoryLeakInFunction::getcode(const Token *tok, std::list<const Toke
                             alloc = No;
                         }
                     }
+
+                    if (alloc == No && alloctype == No)
+                        alloctype = CheckMemoryLeak::New;
                 }
 
                 if (alloc != No)
diff --git a/test/testmemleak.cpp b/test/testmemleak.cpp
index fd45a5070..aa6f6920c 100644
--- a/test/testmemleak.cpp
+++ b/test/testmemleak.cpp
@@ -208,6 +208,7 @@ private:
         TEST_CASE(mismatch2);
         TEST_CASE(mismatch3);
         TEST_CASE(mismatch4);
+        TEST_CASE(mismatch5);
 
         TEST_CASE(mismatchSize);
 
@@ -1425,6 +1426,17 @@ private:
         ASSERT_EQUALS("[test.cpp:7]: (error) Mismatching allocation and deallocation: p\n", errout.str());
     }
 
+    void mismatch5()
+    {
+        check("void f() {\n"
+              "    C *c = new C;\n"
+              "    delete c;\n"
+              "    c = new C[2];\n"
+              "    delete [] c;\n"
+              "}\n", false);
+        ASSERT_EQUALS("", errout.str());
+    }
+
     void mismatchSize()
     {
         check("void f(char *buf)\n"