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

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

Merge "Check for null-terminator in ResStringPool::string8At"

parents b01aaa01 3d35a0ea

libs/androidfw/ResourceTypes.cpp

+7 −1
Original line number Diff line number Diff line
@@ -812,6 +812,12 @@ const char* ResStringPool::string8At(size_t idx, size_t* outLen) const 
            *outLen = encLen;



            if ((uint32_t)(str+encLen-strings) < mStringPoolSize) {

                // Reject malformed (non null-terminated) strings

                if (str[encLen] != 0x00) {

                    ALOGW("Bad string block: string #%d is not null-terminated",

                          (int)idx);

                    return NULL;

                }

              return (const char*)str;

            } else {

                ALOGW("Bad string block: string #%d extends to %d, past end at %d\n",