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

am 4e790e9e: am b4c3c976: Fix crash in ResStringPool

Browse Source 
* commit '4e790e9e4b820290284a78c4258d4d60e8d37320':
  Fix crash in ResStringPool
This commit is contained in:
Adam Lesinski
2014-08-15 11:51:01 +00:00
committed by Android Git Automerger
parent 30f5639cb7 5b9c045a6a
commit ac44bd1c5b
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