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

Commit 6841ff29 authored by Adam Lesinski's avatar Adam Lesinski Committed by android-build-merger
Browse files

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

am: da749ed9

* commit 'da749ed9':
  Fix order of operation issue with ResStringPool

Change-Id: I00fdd69046f77fbc5d4c41476adc2d0a2073d56a
parents e7aa11c8 da749ed9

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);