Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58ba53bd authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents c6c19bd6 a7645bd9

libs/androidfw/ResourceTypes.cpp

+2 −0
Original line number Diff line number Diff line
@@ -4320,6 +4320,7 @@ ssize_t ResTable::getBagLocked(uint32_t resID, const bag_entry** outBag, 
        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 @@ ssize_t ResTable::getBagLocked(uint32_t resID, const bag_entry** outBag, 
            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;

            }

        }