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

Fix crash in ResStringPool

Browse Source 
When a String isn't found in the StringPool,
we should not try to construct a String8 object
from the NULL string.

Bug:15163956
Change-Id: I51e701918b10a72c18a860b8a36dce2afd9c0b82
This commit is contained in:
Adam Lesinski
2014-08-14 17:58:37 -07:00
parent 82d6d337b3
commit 4b2d0f20db
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libs/androidfw/ResourceTypes.cpp
View File

@@ -802,11 +802,16 @@ const char* ResStringPool::string8At(size_t idx, size_t* outLen) const
const String8 ResStringPool::string8ObjectAt(size_t idx) const
{
size_t len;
const char *str = (const char*)string8At(idx, &len);
const char *str = string8At(idx, &len);
if (str != NULL) {
return String8(str);
return String8(str, len);
}
return String8(stringAt(idx, &len));
const char16_t *str16 = stringAt(idx, &len);
if (str16 != NULL) {
return String8(str16, len);
}
return String8();
}
const ResStringPool_span* ResStringPool::styleAt(const ResStringPool_ref& ref) const