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

Commit 3d806ea4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add missing size check when parsing staged aliases" into sc-dev am: d8d54c9a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16371343

Change-Id: Ied2d4feffb231e55a18633ea4011a79fe1f154cd
parents e2dd7e5b d8d54c9a

libs/androidfw/LoadedArsc.cpp

+6 −0
Original line number Diff line number Diff line
@@ -686,6 +686,12 @@ std::unique_ptr<const LoadedPackage> LoadedPackage::Load(const Chunk& chunk, 
        std::unordered_set<uint32_t> finalized_ids;

        const auto lib_alias = child_chunk.header<ResTable_staged_alias_header>();

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

        }

        const auto entry_begin = child_chunk.data_ptr().convert<ResTable_staged_alias_entry>();