am 2f340be3: Disregard alleged binder entities beyond parcel bounds

* commit '2f340be345612d9fc2ecb1ea2a4c9e147610a593':
  Disregard alleged binder entities beyond parcel bounds
This commit is contained in:
Christopher Tate 2015-07-02 01:28:56 +00:00 committed by Android Git Automerger
commit eba7afcc14

View File

@ -411,7 +411,7 @@ status_t Parcel::appendFrom(const Parcel *parcel, size_t offset, size_t len)
// Count objects in range // Count objects in range
for (int i = 0; i < (int) size; i++) { for (int i = 0; i < (int) size; i++) {
size_t off = objects[i]; size_t off = objects[i];
if ((off >= offset) && (off < offset + len)) { if ((off >= offset) && (off + sizeof(flat_binder_object) <= offset + len)) {
if (firstIndex == -1) { if (firstIndex == -1) {
firstIndex = i; firstIndex = i;
} }