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

* commit 'd13b23a436075262cc83f7502f7159de24546003':
  Revert "fix potential memory leak"
This commit is contained in:
Elliott Hughes
2013-01-03 18:47:37 -08:00
committed by Android Git Automerger

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 {