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

Avoid Asset::LoadImpl crash when getBuffer is null

Browse Source 
If for some reason Asset::getBuffer returns a null pointer, error out
instead of dereferencing the null pointer.

Bug: 125943266
Bug: 154461471

Test: boots
Change-Id: I957be4f9b8c49c2a6829e8b82fae0ae8d8d7639e
This commit is contained in:
Ryan Mitchell
2019-02-23 15:33:08 +08:00
parent 57e977a585
commit d338dfe583
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libs/androidfw/ApkAssets.cpp Normal file → Executable file
View File

@@ -496,6 +496,11 @@ std::unique_ptr<const ApkAssets> ApkAssets::LoadImpl(
const StringPiece data(
reinterpret_cast<const char*>(loaded_apk->resources_asset_->getBuffer(true /*wordAligned*/)),
loaded_apk->resources_asset_->getLength());
if (data.data() == nullptr || data.empty()) {
LOG(ERROR) << "Failed to read '" << kResourcesArsc << "' data in APK '" << path << "'.";
return {};
}
loaded_apk->loaded_arsc_ = LoadedArsc::Load(data, loaded_apk->loaded_idmap_.get(),
property_flags);
if (!loaded_apk->loaded_arsc_) {
@@ -523,9 +528,14 @@ std::unique_ptr<const ApkAssets> ApkAssets::LoadTableImpl(
const StringPiece data(
reinterpret_cast<const char*>(loaded_apk->resources_asset_->getBuffer(true /*wordAligned*/)),
loaded_apk->resources_asset_->getLength());
if (data.data() == nullptr || data.empty()) {
LOG(ERROR) << "Failed to read resources table data in '" << path << "'.";
return {};
}
loaded_apk->loaded_arsc_ = LoadedArsc::Load(data, nullptr, property_flags);
if (loaded_apk->loaded_arsc_ == nullptr) {
LOG(ERROR) << "Failed to load '" << kResourcesArsc << path;
LOG(ERROR) << "Failed to read resources table in '" << path << "'.";
return {};
}