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

Commit 1c4ccab9 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by android-build-merger
Browse files

Merge changes from topic "am-1ab9514f-fd12-4093-b1cb-a77e9f0419c9" into oc-dev am: 46fc48f5 

am: b39e49d5

Change-Id: Iaf02c5ebdb656fc79cde201e6df97760283ea4e4
parents 152acb51 b39e49d5

libs/androidfw/ResourceTypes.cpp

+7 −1
Original line number Diff line number Diff line
@@ -813,6 +813,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",