summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Wan He <xiaolin.gxl@alibaba-inc.com> 2016-11-18 22:48:28 +0000
committer android-build-merger <android-build-merger@google.com> 2016-11-18 22:48:28 +0000
commit2f176bb2cddc40ae2dc5ec0befab0b3e30d600ef (patch)
treec09753d2401b631097b6cc2062b030ab5267eb57
parenta16a77781e8459bca6f6c7edfb73ac7638d8ad70 (diff)
parent530fdccbe405e2506912ed78a337acf1e66d8d4d (diff)
Merge "Fix incorrect calculation of sizeof package structure" am: 757e286cc8
am: 530fdccbe4 Change-Id: I92417758a165741a4346d6b6c3f3491776b86729
-rw-r--r--libs/androidfw/ResourceTypes.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp
index fd30c25bec41..e10db05e8557 100644
--- 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;