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

Commit f8c94073 authored by Adam Lesinski's avatar Adam Lesinski Committed by Android (Google) Code Review
Browse files

Merge "Fix potential crash in libandroidfw"

parents 2cf18423 7322ea7b

libs/androidfw/ResourceTypes.cpp

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static status_t validate_chunk(const ResChunk_header* chunk, 
    if (headerSize >= minSize) {

        if (headerSize <= size) {

            if (((headerSize|size)&0x3) == 0) {

                if ((ssize_t)size <= (dataEnd-((const uint8_t*)chunk))) {

                if ((size_t)size <= (size_t)(dataEnd-((const uint8_t*)chunk))) {

                    return NO_ERROR;

                }

                ALOGW("%s data size 0x%x extends beyond resource end %p.",