commit | 9aac0c1b35ec666a18f320be99e6aa37d0bcf202 | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Thu Jan 03 17:35:57 2013 -0800 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Jan 03 17:35:57 2013 -0800 |
tree | 9a52139e7292ebce1e31751f6ce6214d73b9f64b | |
parent | 41bb82becea5dd1f995dbca5bf5a719f559102de [diff] | |
parent | bc268b9014f211910e412a7fda96b6394ff2badc [diff] |
Merge "fix potential memory leak"
diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp index fc2cd9e..683c49f 100644 --- a/libs/androidfw/ResourceTypes.cpp +++ b/libs/androidfw/ResourceTypes.cpp
@@ -5037,11 +5037,14 @@ } 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 {