diff options
| author | Christopher Tate <ctate@google.com> | 2015-07-02 01:41:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-02 01:41:09 +0000 |
| commit | 708b42e0ee5ad97b8426a6245f73131ddfc59a33 (patch) | |
| tree | 56ad597ef5bfa29de855b23abdaf0b11b75a94f6 | |
| parent | 9e415d719e4ceb7a3e93c0d60f9c3bf9ee4fc97f (diff) | |
| parent | eba7afcc14f55e7fd32db9254f2b186108e1c776 (diff) | |
| download | native-708b42e0ee5ad97b8426a6245f73131ddfc59a33.tar.gz | |
am eba7afcc: am 2f340be3: Disregard alleged binder entities beyond parcel bounds
* commit 'eba7afcc14f55e7fd32db9254f2b186108e1c776':
Disregard alleged binder entities beyond parcel bounds
| -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; } |