ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correct overflow check in Parcel resize code

Browse Source 
Fix merge conflict into nyc-mr1-release
Bug 31929765

Change-Id: Ie27b9945f1de056624668869bdf9a5578abff467
(cherry picked from commit 65dd433f0db2fe402dc725f7012c6e26769b3224)
(cherry picked from commit b4d6b292bce7d82c93fd454078dedf5a1302b9fa)
This commit is contained in:
Christopher Tate 2016-11-03 13:32:41 -07:00 committed by Brinly Taylor
parent 78f9ca0f1f
commit 0ff545d4a7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/binder/Parcel.cpp
View File

@ -553,7 +553,7 @@ status_t Parcel::appendFrom(const Parcel *parcel, size_t offset, size_t len)
// grow objects // grow objects
if (mObjectsCapacity < mObjectsSize + numObjects) { if (mObjectsCapacity < mObjectsSize + numObjects) {
size_t newSize = ((mObjectsSize + numObjects)*3)/2; 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 *objects =
(binder_size_t*)realloc(mObjects, newSize*sizeof(binder_size_t)); (binder_size_t*)realloc(mObjects, newSize*sizeof(binder_size_t));
if (objects == (binder_size_t*)0) { if (objects == (binder_size_t*)0) {
@ -1113,7 +1113,7 @@ restart_write:
} }
if (!enoughObjects) { if (!enoughObjects) {
size_t newSize = ((mObjectsSize+2)*3)/2; 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)); binder_size_t* objects = (binder_size_t*)realloc(mObjects, newSize*sizeof(binder_size_t));
if (objects == NULL) return NO_MEMORY; if (objects == NULL) return NO_MEMORY;
mObjects = objects; mObjects = objects;