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

Commit 08a77b1f authored by Wan He's avatar Wan He Committed by android-build-merger
Browse files

Merge "Fix incorrect calculation of sizeof package structure" am: 757e286c... 

Merge "Fix incorrect calculation of sizeof package structure" am: 757e286c am: 530fdccb am: 2f176bb2
am: 8e5ff072

Change-Id: I0a0cefef7df2cebfc9687f17abc9797f7cd61ca7
parents 5448cd6e 8e5ff072

libs/androidfw/ResourceTypes.cpp

+1 −1
Original line number Diff line number Diff line
@@ -3204,7 +3204,7 @@ struct ResTable::Package 
{

    Package(ResTable* _owner, const Header* _header, const ResTable_package* _package)

        : owner(_owner), header(_header), package(_package), typeIdOffset(0) {

        if (dtohs(package->header.headerSize) == sizeof(package)) {

        if (dtohs(package->header.headerSize) == sizeof(*package)) {

            // The package structure is the same size as the definition.

            // This means it contains the typeIdOffset field.

            typeIdOffset = package->typeIdOffset;