Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Range checking for ResTable_map"

Browse Source
This commit is contained in:
Kenny Root
2010-06-08 12:52:57 -07:00
committed by Android (Google) Code Review
parent 37d33a546b 06983bc566
commit b209c9e2a2
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libs/utils/ResourceTypes.cpp
View File

@@ -4432,18 +4432,19 @@ void ResTable::print(bool inclValues) const
print_value(pkg, value);
} else if (bagPtr != NULL) {
const int N = dtohl(bagPtr->count);
const ResTable_map* mapPtr = (const ResTable_map*)
(((const uint8_t*)ent) + esize);
const uint8_t* baseMapPtr = (const uint8_t*)ent;
size_t mapOffset = esize;
const ResTable_map* mapPtr = (ResTable_map*)(baseMapPtr+mapOffset);
printf(" Parent=0x%08x, Count=%d\n",
dtohl(bagPtr->parent.ident), N);
for (int i=0; i<N && (thisOffset+sizeof(ResTable_map)) < typeSize; i++) {
for (int i=0; i<N && mapOffset < (typeSize-sizeof(ResTable_map)); i++) {
printf(" #%i (Key=0x%08x): ",
i, dtohl(mapPtr->name.ident));
value.copyFrom_dtoh(mapPtr->value);
print_value(pkg, value);
const size_t size = dtohs(mapPtr->value.size);
thisOffset += size + sizeof(*mapPtr)-sizeof(mapPtr->value);
mapPtr = (ResTable_map*)(((const uint8_t*)mapPtr)+thisOffset);
mapOffset += size + sizeof(*mapPtr)-sizeof(mapPtr->value);
mapPtr = (ResTable_map*)(baseMapPtr+mapOffset);
}
}
}