am 5a31f1ab: Merge "Disregard alleged binder entities beyond parcel bounds" into mnc-dev

* commit '5a31f1abf69eaf4c25a84d53e318c0a716911786':
  Disregard alleged binder entities beyond parcel bounds
This commit is contained in:
Christopher Tate 2015-06-02 14:23:27 +00:00 committed by Android Git Automerger
commit 10fd0f18ec

View File

@ -451,7 +451,7 @@ status_t Parcel::appendFrom(const Parcel *parcel, size_t offset, size_t len)
// Count objects in range
for (int i = 0; i < (int) size; 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) {
firstIndex = i;
}