diff options
| author | Elliott Hughes <enh@google.com> | 2013-01-03 17:40:55 -0800 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-01-03 17:40:55 -0800 |
| commit | d13b23a436075262cc83f7502f7159de24546003 (patch) | |
| tree | 410cb9f68fb982f9ee5ee3b2363823fb86f003e6 /libs | |
| parent | 9aac0c1b35ec666a18f320be99e6aa37d0bcf202 (diff) | |
| parent | 957efcdc7331957df415faf9ab40f8bc08f5bd99 (diff) | |
| download | frameworks_base-d13b23a436075262cc83f7502f7159de24546003.zip frameworks_base-d13b23a436075262cc83f7502f7159de24546003.tar.gz frameworks_base-d13b23a436075262cc83f7502f7159de24546003.tar.bz2 | |
Merge "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 683c49f..fc2cd9e 100644 --- a/libs/androidfw/ResourceTypes.cpp +++ b/libs/androidfw/ResourceTypes.cpp @@ -5037,14 +5037,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 { |