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 am: b53e8a7a8a

Browse Source 
am: da749ed997

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

Change-Id: I00fdd69046f77fbc5d4c41476adc2d0a2073d56a
This commit is contained in:
Adam Lesinski
2016-04-21 19:18:04 +00:00
committed by android-build-merger
parent e7aa11c898 da749ed997
commit 6841ff299c
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);