commit 71dfc7e9accc1ca3cda52bdf475b03fa2a334e78
author Narayan Kamath <narayan@google.com> Tue Jun 24 14:16:04 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 24 06:22:45 2014 +0000
tree 4364fd85bd976ee1456792b346069c1a0b889e27
parent 2a0f9e6a523abc28bdbc249010f5ddd184a27730
parent 5f7ce10c937abf7da6d547ae91bda495dfbc414d

Merge "Memory leak in parsePackage"

libs/androidfw/ResourceTypes.cpp

diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp
index 1ffe665..2c828c1e 100644
--- a/libs/androidfw/ResourceTypes.cpp
+++ b/libs/androidfw/ResourceTypes.cpp
@@ -5405,23 +5405,33 @@
                 return (mError=err);
             }
 
-            //printf("Adding new package id %d at index %d\n", id, idx);
-            err = mPackageGroups.add(group);
+            err = group->packages.add(package);
             if (err < NO_ERROR) {
+                delete group;
+                delete package;
                 return (mError=err);
             }
             group->basePackage = package;
 
+            //printf("Adding new package id %d at index %d\n", id, idx);
+            err = mPackageGroups.add(group);
+            if (err < NO_ERROR) {
+                delete group;
+                return (mError=err);
+            }
+
             mPackageMap[id] = (uint8_t)idx;
         } else {
             group = mPackageGroups.itemAt(idx-1);
             if (group == NULL) {
+                delete package;
                 return (mError=UNKNOWN_ERROR);
             }
-        }
-        err = group->packages.add(package);
-        if (err < NO_ERROR) {
-            return (mError=err);
+            err = group->packages.add(package);
+            if (err < NO_ERROR) {
+                delete package;
+                return (mError=err);
+            }
         }
     } else {
         LOG_ALWAYS_FATAL("Package id out of range");