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

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

Browse Source 
am: 46fc48f57e

Change-Id: I85ba0993926fbd9a61525e35e411887130b3c5aa
This commit is contained in:
Android Build Merger (Role)
2018-02-01 03:13:16 +00:00
committed by android-build-merger
parent df255a4a6b 46fc48f57e
commit b39e49d52c
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/androidfw/ResourceTypes.cpp
View File

@@ -813,7 +813,13 @@ const char* ResStringPool::string8At(size_t idx, size_t* outLen) const
*outLen = encLen; *outLen = encLen;
if ((uint32_t)(str+encLen-strings) < mStringPoolSize) { if ((uint32_t)(str+encLen-strings) < mStringPoolSize) {
return (const char*)str; // 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 { } else {
ALOGW("Bad string block: string #%d extends to %d, past end at %d\n", ALOGW("Bad string block: string #%d extends to %d, past end at %d\n",
(int)idx, (int)(str+encLen-strings), (int)mStringPoolSize); (int)idx, (int)(str+encLen-strings), (int)mStringPoolSize);