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

Commit abdf5a51 authored by Yurii Zubrytskyi's avatar Yurii Zubrytskyi
Browse files

Add missing size check when parsing staged aliases 

Need to have the same kind of data size check as in other
types parsing

Bug: 203938029
Test: manual
Change-Id: I9f5d2851ff59da90163ead6c0416f0bba3868cc4
Merged-In: I9f5d2851ff59da90163ead6c0416f0bba3868cc4
(cherry picked from commit 8002034e)
parent 85547878

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>();