commit a74d1332cc9f63dc3187cfa74befb448dab5e77d
author Elliott Hughes <enh@google.com> Thu Jan 03 18:50:08 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Jan 03 18:50:08 2013 -0800
tree b13108014c51ebbe71a07d463c0c06ac7508cd9f
parent f18eb323c38cd4407b16dc8eda1cc860bb100850
parent 81cfb63e9fc6ef72e5b488225fe9b7a43551fc9e

am 81cfb63e: am d13b23a4: Merge "Revert "fix potential memory leak""

* commit '81cfb63e9fc6ef72e5b488225fe9b7a43551fc9e':
  Revert "fix potential memory leak"

libs/androidfw/ResourceTypes.cpp

diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp
index 094def4..a730065 100644
--- a/libs/androidfw/ResourceTypes.cpp
+++ b/libs/androidfw/ResourceTypes.cpp
@@ -5038,14 +5038,11 @@
         } else {
             group = mPackageGroups.itemAt(idx-1);
             if (group == NULL) {
-                delete package;
                 return (mError=UNKNOWN_ERROR);
             }
         }
         err = group->packages.add(package);
         if (err < NO_ERROR) {
-            delete group;
-            delete package;
             return (mError=err);
         }
     } else {