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 am: 530fdccbe4

Browse Source 
am: 2f176bb2cd

Change-Id: I4dd8f888102fadb1d636256e742742ad2388af2b
This commit is contained in:
Wan He
2016-11-18 22:53:09 +00:00
committed by android-build-merger
parent 6daed59698 2f176bb2cd
commit 8e5ff07293
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;