Merge "Fix incorrect calculation of sizeof package structure"

2016-11-18 22:30:41 +00:00
parent 3cbf2c2657 3ff4226363
commit 757e286cc8
1 changed files with 1 additions and 1 deletions
--- a/libs/androidfw/ResourceTypes.cpp
+++ b/libs/androidfw/ResourceTypes.cpp
@@ -3166,7 +3166,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;