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

Merge "Add missing size check when parsing staged aliases" into sc-qpr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-12-07 19:45:58 +00:00
committed by Android (Google) Code Review
parent 9ae4d14f5d abdf5a518d
commit 81e1e9b53b
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/androidfw/LoadedArsc.cpp
View File

@@ -686,6 +686,12 @@ std::unique_ptr<const LoadedPackage> LoadedPackage::Load(const Chunk& chunk,
std::unordered_set<uint32_t> finalized_ids; std::unordered_set<uint32_t> finalized_ids;
const auto lib_alias = child_chunk.header<ResTable_staged_alias_header>(); const auto lib_alias = child_chunk.header<ResTable_staged_alias_header>();
if (!lib_alias) { if (!lib_alias) {
LOG(ERROR) << "RES_TABLE_STAGED_ALIAS_TYPE is too small.";
return {};
}
if ((child_chunk.data_size() / sizeof(ResTable_staged_alias_entry))
< dtohl(lib_alias->count)) {
LOG(ERROR) << "RES_TABLE_STAGED_ALIAS_TYPE is too small to hold entries.";
return {}; return {};
} }
const auto entry_begin = child_chunk.data_ptr().convert<ResTable_staged_alias_entry>(); const auto entry_begin = child_chunk.data_ptr().convert<ResTable_staged_alias_entry>();