summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Elliott Hughes <enh@google.com> 2013-01-03 18:50:08 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2013-01-03 18:50:08 -0800
commita74d1332cc9f63dc3187cfa74befb448dab5e77d (patch)
treeb13108014c51ebbe71a07d463c0c06ac7508cd9f
parentf18eb323c38cd4407b16dc8eda1cc860bb100850 (diff)
parent81cfb63e9fc6ef72e5b488225fe9b7a43551fc9e (diff)
am 81cfb63e: am d13b23a4: Merge "Revert "fix potential memory leak""
* commit '81cfb63e9fc6ef72e5b488225fe9b7a43551fc9e': Revert "fix potential memory leak"
-rw-r--r--libs/androidfw/ResourceTypes.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp
index 094def4cb28c..a7300652077b 100644
--- a/libs/androidfw/ResourceTypes.cpp
+++ b/libs/androidfw/ResourceTypes.cpp
@@ -5038,14 +5038,11 @@ status_t ResTable::parsePackage(const ResTable_package* const pkg,
} 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 {