diff options
| author | Michael Wachenschwanz <mwachens@google.com> | 2019-10-15 11:49:22 -0700 |
|---|---|---|
| committer | Manjae Park <manjaepark@google.com> | 2019-12-16 12:39:16 -0800 |
| commit | 4276ad7cac48a4d15cae8337711b69eef3900071 (patch) | |
| tree | fb4417c03e522a4f20723427d4603f1a2f497abe | |
| parent | ba1e3211158be985a6344724b15ab76c66203f03 (diff) | |
| download | android_frameworks_native-4276ad7cac48a4d15cae8337711b69eef3900071.tar.gz android_frameworks_native-4276ad7cac48a4d15cae8337711b69eef3900071.tar.bz2 android_frameworks_native-4276ad7cac48a4d15cae8337711b69eef3900071.zip | |
Resize object capacity when shrinking Parcel
Bug: 140419401
Test: atest android.os.cts.ParcelTest
Change-Id: I04edee415e1984ba5fb97c5c1b09892a360cf221
(cherry picked from commit c67d9f33b36cbb95b121d058f51d6653f1ec4334)
(cherry picked from commit d9d10dbdf2f20af3dd01376d2130c71c052e42f3)
| -rw-r--r-- | libs/binder/Parcel.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp index 59a363f8d..89516bc11 100644 --- a/libs/binder/Parcel.cpp +++ b/libs/binder/Parcel.cpp @@ -2713,11 +2713,13 @@ status_t Parcel::continueWrite(size_t desired) if (objectsSize == 0) { free(mObjects); mObjects = nullptr; + mObjectsCapacity = 0; } else { binder_size_t* objects = (binder_size_t*)realloc(mObjects, objectsSize*sizeof(binder_size_t)); if (objects) { mObjects = objects; + mObjectsCapacity = objectsSize; } } mObjectsSize = objectsSize; |