Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: b53e8a7a8a

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

Change-Id: Idaca4dee242389680b82b9d58728d281a65f9116
This commit is contained in:
Adam Lesinski
2016-04-21 19:15:47 +00:00
committed by android-build-merger
parent bdf90a2d1c b53e8a7a8a
commit da749ed997
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/androidfw/ResourceTypes.cpp
View File

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