diff options
| author | Christopher Tate <ctate@google.com> | 2015-05-27 17:53:02 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2015-08-13 19:41:48 -0700 |
| commit | e68cbc3e9e66df4231e70efa3e9c41abc12aea20 (patch) | |
| tree | a9f9f223944d8a00fa8c374dffad81a7701451a6 | |
| parent | 7dcd0ec9c91688cfa3f679804ba6e132f9811254 (diff) | |
| download | native-e68cbc3e9e66df4231e70efa3e9c41abc12aea20.tar.gz | |
Disregard alleged binder entities beyond parcel boundsandroid-cts-5.1_r3android-5.1.1_r24android-5.1.1_r20android-5.1.1_r19android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14
When appending one parcel's contents to another, ignore binder
objects within the source Parcel that appear to lie beyond the
formal bounds of that Parcel's data buffer.
Bug 17312693
Change-Id: If592a260f3fcd9a56fc160e7feb2c8b44c73f514
(cherry picked from commit 27182be9f20f4f5b48316666429f09b9ecc1f22e)
| -rw-r--r-- | libs/binder/Parcel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp index 99c934cdd4..87ce5d076e 100644 --- a/libs/binder/Parcel.cpp +++ b/libs/binder/Parcel.cpp @@ -411,7 +411,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; } |