drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 530fdccbe4

Change-Id: I92417758a165741a4346d6b6c3f3491776b86729
This commit is contained in:
Wan He
2016-11-18 22:48:28 +00:00
committed by android-build-merger
parent a16a77781e 530fdccbe4
commit 2f176bb2cd
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/androidfw/ResourceTypes.cpp
View File

@ -3166,7 +3166,7 @@ struct ResTable::Package
{ {
Package(ResTable* _owner, const Header* _header, const ResTable_package* _package) Package(ResTable* _owner, const Header* _header, const ResTable_package* _package)
: owner(_owner), header(_header), package(_package), typeIdOffset(0) { : 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. // The package structure is the same size as the definition.
// This means it contains the typeIdOffset field. // This means it contains the typeIdOffset field.
typeIdOffset = package->typeIdOffset; typeIdOffset = package->typeIdOffset;