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

Commit e2417e66 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role)
Browse files

[automerger] Check for null-terminator in ResStringPool::string8At am: 5ec65ae9 am: c3d7250b 

Change-Id: I43a4eb54f67bd3dbcffd0432c3988b0377463fff
parents eee67738 c3d7250b

libs/androidfw/ResourceTypes.cpp

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

            size_t encLen = decodeLength(&str);

            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",