drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'a74d1332cc9f63dc3187cfa74befb448dab5e77d':
  Revert "fix potential memory leak"
This commit is contained in:
Elliott Hughes
2013-01-03 18:53:06 -08:00
committed by Android Git Automerger
parent 6bbc79f26e a74d1332cc
commit 0aa212e32a
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libs/androidfw/ResourceTypes.cpp
View File

@ -5038,14 +5038,11 @@ status_t ResTable::parsePackage(const ResTable_package* const pkg,
} else { } else {
group = mPackageGroups.itemAt(idx-1); group = mPackageGroups.itemAt(idx-1);
if (group == NULL) { if (group == NULL) {
delete package;
return (mError=UNKNOWN_ERROR); return (mError=UNKNOWN_ERROR);
} }
} }
err = group->packages.add(package); err = group->packages.add(package);
if (err < NO_ERROR) { if (err < NO_ERROR) {
delete group;
delete package;
return (mError=err); return (mError=err);
} }
} else { } else {