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

Commit 87fe5e01 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Avoid Asset::LoadImpl crash when getBuffer is null" into rvc-dev am: 058945a4 

Change-Id: I1b76674a47ec8058a63252148c629958648fa49b
parents 1bc43717 058945a4

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 {};

  }