Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d338dfe5 authored by Ryan Mitchell's avatar Ryan Mitchell
Browse files

Avoid Asset::LoadImpl crash when getBuffer is null 

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
parent 57e977a5

libs/androidfw/ApkAssets.cpp

100644 → 100755
+11 −1
Original line number Diff line number Diff line
@@ -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 {};

  }