commit 58ba53bd53d08c8d23f8fa338aa4c4bb6bc86c91
author Treehugger Robot <treehugger-gerrit@google.com> Wed Mar 22 00:17:32 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 22 00:17:33 2017 +0000
tree a117080b7ca7f2c58ac5a4e6f6d666099d87aa7e
parent c6c19bd6c0f52c90a4571590f28b246d4258076f
parent a7645bd9478afa463e9708fbc0b91ec51b3f4bf3

Merge "Fix warning: Potential leak of memory pointed to by 'set'"

libs/androidfw/ResourceTypes.cpp

diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp
index e10db05..38d2a58 100644
--- a/libs/androidfw/ResourceTypes.cpp
+++ b/libs/androidfw/ResourceTypes.cpp
@@ -4320,6 +4320,7 @@
         if (curOff > (dtohl(entry.type->header.size)-sizeof(ResTable_map))) {
             ALOGW("ResTable_map at %d is beyond type chunk data %d",
                  (int)curOff, dtohl(entry.type->header.size));
+            free(set);
             return BAD_TYPE;
         }
         map = (const ResTable_map*)(((const uint8_t*)entry.type) + curOff);
@@ -4332,6 +4333,7 @@
             if (grp->dynamicRefTable.lookupResourceId(&newName) != NO_ERROR) {
                 ALOGE("Failed resolving ResTable_map name at %d with ident 0x%08x",
                         (int) curOff, (int) newName);
+                free(set);
                 return UNKNOWN_ERROR;
             }
         }