diff options
| author | Elliott Hughes <enh@google.com> | 2013-01-03 18:47:37 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-01-03 18:47:37 -0800 |
| commit | 81cfb63e9fc6ef72e5b488225fe9b7a43551fc9e (patch) | |
| tree | b3b162d6efb8ab2d7b83783989384261fefc0d95 /libs | |
| parent | 767e1c010c0664fa4bf7e7e32b840af4bbe0b0cf (diff) | |
| parent | d13b23a436075262cc83f7502f7159de24546003 (diff) | |
| download | frameworks_base-81cfb63e9fc6ef72e5b488225fe9b7a43551fc9e.zip frameworks_base-81cfb63e9fc6ef72e5b488225fe9b7a43551fc9e.tar.gz frameworks_base-81cfb63e9fc6ef72e5b488225fe9b7a43551fc9e.tar.bz2 | |
am d13b23a4: Merge "Revert "fix potential memory leak""
* commit 'd13b23a436075262cc83f7502f7159de24546003':
Revert "fix potential memory leak"
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/androidfw/ResourceTypes.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
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 @@ 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 { |