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

Commit f7bd2507 authored by Ryan Mitchell's avatar Ryan Mitchell Committed by Android (Google) Code Review
Browse files

Merge changes from topic "dynamic-ref-se-mnc-dev" into nyc-dr1-dev 

* changes:
  [automerger] Fix DynamicRefTable::load security bug am: 8cf0f988 am: d65dbf91 am: aeb2fc64 am: 09386896 am: 6f76fbfc
  [automerger] Fix DynamicRefTable::load security bug am: 8cf0f988 am: d65dbf91 am: aeb2fc64 am: 09386896
  [automerger] Fix DynamicRefTable::load security bug am: 8cf0f988 am: d65dbf91 am: aeb2fc64
  [automerger] Fix DynamicRefTable::load security bug am: 8cf0f988 am: d65dbf91
  [automerger] Fix DynamicRefTable::load security bug am: 8cf0f988
  Fix DynamicRefTable::load security bug
parents 1d9938dc 69b14d2a

libs/androidfw/ResourceTypes.cpp

+9 −1
Original line number Original line Diff line number Diff line
@@ -6415,8 +6415,16 @@ status_t ResTable::parsePackage(const ResTable_package* const pkg, 
            }

            }





        } else if (ctype == RES_TABLE_LIBRARY_TYPE) {

        } else if (ctype == RES_TABLE_LIBRARY_TYPE) {



            if (group->dynamicRefTable.entries().size() == 0) {

            if (group->dynamicRefTable.entries().size() == 0) {

                status_t err = group->dynamicRefTable.load((const ResTable_lib_header*) chunk);

                const ResTable_lib_header* lib = (const ResTable_lib_header*) chunk;

                status_t err = validate_chunk(&lib->header, sizeof(*lib),

                                              endPos, "ResTable_lib_header");

                if (err != NO_ERROR) {

                    return (mError=err);

                }



                err = group->dynamicRefTable.load(lib);

                if (err != NO_ERROR) {

                if (err != NO_ERROR) {

                    return (mError=err);

                    return (mError=err);

                }

                }