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

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

Merge "Fix order of operation issue with ResStringPool" into nyc-dev

parents dc7ce840 666b6fbb

libs/androidfw/ResourceTypes.cpp

+1 −1
Original line number Diff line number Diff line
@@ -562,7 +562,7 @@ status_t ResStringPool::setTo(const void* data, size_t size, bool copyData) 


        if ((mHeader->flags&ResStringPool_header::UTF8_FLAG &&

                ((uint8_t*)mStrings)[mStringPoolSize-1] != 0) ||

                (!mHeader->flags&ResStringPool_header::UTF8_FLAG &&

                (!(mHeader->flags&ResStringPool_header::UTF8_FLAG) &&

                ((uint16_t*)mStrings)[mStringPoolSize-1] != 0)) {

            ALOGW("Bad string block: last string is not 0-terminated\n");

            return (mError=BAD_TYPE);