am 767e1c01: am 9aac0c1b: Merge "fix potential memory leak"

* commit '767e1c010c0664fa4bf7e7e32b840af4bbe0b0cf': fix potential memory leak
2013-01-03 18:50:03 -08:00
parent c41db6c9ba 767e1c010c
commit f18eb323c3
1 changed files with 3 additions and 0 deletions
--- a/libs/androidfw/ResourceTypes.cpp
+++ b/libs/androidfw/ResourceTypes.cpp
@ -5038,11 +5038,14 @@ 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 {