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

[automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce am: aeb2fc64d9 am: 0938689606 am: 6f76fbfc69 am: 69b14d2a1a

Browse Source 
Change-Id: I6e7ab766f6c88e61b8c2993a2f1420efc177319a
This commit is contained in:
Android Build Merger (Role)
2018-06-06 17:12:46 +00:00
parent c62d510887 69b14d2a1a
commit c7e3991628
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libs/androidfw/ResourceTypes.cpp
View File

@@ -6415,8 +6415,16 @@ status_t ResTable::parsePackage(const ResTable_package* const pkg,
}
} else if (ctype == RES_TABLE_LIBRARY_TYPE) {
if (group->dynamicRefTable.entries().size() == 0) {
status_t err = group->dynamicRefTable.load((const ResTable_lib_header*) chunk);
const ResTable_lib_header* lib = (const ResTable_lib_header*) chunk;
status_t err = validate_chunk(&lib->header, sizeof(*lib),
endPos, "ResTable_lib_header");
if (err != NO_ERROR) {
return (mError=err);
}
err = group->dynamicRefTable.load(lib);
if (err != NO_ERROR) {
return (mError=err);
}