[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [umbrello] umbrello: Coverity check on master@bd16929, CID 71420: Resource leak
From:       Oliver Kellogg <okellogg () users ! sourceforge ! net>
Date:       2014-10-29 6:38:13
Message-ID: E1XjMtZ-0000sY-6f () scm ! kde ! org
[Download RAW message or body]

Git commit 98f13e2604d430019451820c7ee1bfdca750fec9 by Oliver Kellogg.
Committed on 29/10/2014 at 06:38.
Pushed by okellogg into branch 'master'.

Coverity check on master@bd16929, CID 71420: Resource leak

umbrello/import_rose.cpp function loadFromMDL()
> RESOURCE_LEAK
> Variable root going out of scope leaks the storage it points to.

M  +5    -1    umbrello/import_rose.cpp

http://commits.kde.org/umbrello/98f13e2604d430019451820c7ee1bfdca750fec9

diff --git a/umbrello/import_rose.cpp b/umbrello/import_rose.cpp
index c875b46..3ede636 100644
--- a/umbrello/import_rose.cpp
+++ b/umbrello/import_rose.cpp
@@ -498,11 +498,14 @@ UMLPackage* loadFromMDL(QFile& file, UMLPackage *parentPkg /* = 0 */)
         return NULL;
 
     if (parentPkg) {
-        return petalTree2Uml(root, parentPkg);
+        UMLPackage *child = petalTree2Uml(root, parentPkg);
+        delete root;
+        return child;
     }
 
     if (root->name() != QLatin1String("Design")) {
         uError() << "expecting root name Design";
+        delete root;
         return NULL;
     }
     Import_Utils::assignUniqueIdOnCreation(false);
@@ -536,6 +539,7 @@ UMLPackage* loadFromMDL(QFile& file, UMLPackage *parentPkg /* = 0 */)
                                      QLatin1String("ProcsNDevs"), QLatin1String("Processes"));
 
     //***************************       wrap up        ********************************
+    delete root;
     umldoc->setCurrentRoot(Uml::ModelType::Logical);
     Import_Utils::assignUniqueIdOnCreation(true);
     umldoc->resolveTypes();
[prev in list] [next in list] [prev in thread] [next in thread]