diff options
| author | Christopher Tate <ctate@google.com> | 2016-11-03 13:32:41 -0700 |
|---|---|---|
| committer | gitbuildkicker <android-build@google.com> | 2016-12-15 16:32:31 -0800 |
| commit | dd1cf9f06a9c32c79a4b8834d813686c76d69859 (patch) | |
| tree | 41e66f6c50a8e5aa9b8b5d13b3aca612ab6653b5 | |
| parent | 826d31c60370ad42c0eb0e460124b0258fbec09a (diff) | |
| download | native-dd1cf9f06a9c32c79a4b8834d813686c76d69859.tar.gz | |
Correct overflow check in Parcel resize codeandroid-7.0.0_r31android-7.0.0_r30android-7.0.0_r29
fix merge conflict into nyc-bugfix-release
Bug 31929765
Change-Id: Ie27b9945f1de056624668869bdf9a5578abff467
(cherry picked from commit 85ab52f18a4e73809f09581a74b53492103e481c)
| -rw-r--r-- | libs/binder/Parcel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp index e88ae29518..19ce3ebae2 100644 --- a/libs/binder/Parcel.cpp +++ b/libs/binder/Parcel.cpp @@ -548,7 +548,7 @@ status_t Parcel::appendFrom(const Parcel *parcel, size_t offset, size_t len) // grow objects if (mObjectsCapacity < mObjectsSize + numObjects) { size_t newSize = ((mObjectsSize + numObjects)*3)/2; - if (newSize < mObjectsSize) return NO_MEMORY; // overflow + if (newSize*sizeof(binder_size_t) < mObjectsSize) return NO_MEMORY; // overflow binder_size_t *objects = (binder_size_t*)realloc(mObjects, newSize*sizeof(binder_size_t)); if (objects == (binder_size_t*)0) { @@ -1342,7 +1342,7 @@ restart_write: } if (!enoughObjects) { size_t newSize = ((mObjectsSize+2)*3)/2; - if (newSize < mObjectsSize) return NO_MEMORY; // overflow + if (newSize*sizeof(binder_size_t) < mObjectsSize) return NO_MEMORY; // overflow binder_size_t* objects = (binder_size_t*)realloc(mObjects, newSize*sizeof(binder_size_t)); if (objects == NULL) return NO_MEMORY; mObjects = objects; |