Merge "Fix incorrect calculation of sizeof package structure" am: 757e286cc8
am: 530fdccbe4
Change-Id: I92417758a165741a4346d6b6c3f3491776b86729
This commit is contained in:
@ -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;
|
||||||
|
Reference in New Issue
Block a user