| commit | 514b046bbb620bc2e45c961cc734025b9677428a | [log] [tgz] |
|---|---|---|
| author | Devin Moore <devinmoore@google.com> | Thu Jun 25 22:45:37 2020 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jun 25 22:45:37 2020 +0000 |
| tree | c41c50f74884d87a62878e8c879002230179a52e | |
| parent | 69bf8bb84b0953ecb75f10235563d5d2a56335b5 [diff] | |
| parent | 4a1f294217e1c3869d54b4408f0f6aa175d77e0a [diff] |
Merge "Update parcel data pointer after realloc with size 0"
diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp index 166c1d8..5ea56de 100644 --- a/libs/binder/Parcel.cpp +++ b/libs/binder/Parcel.cpp
@@ -2667,7 +2667,7 @@ releaseObjects(); - if (data) { + if (data || desired == 0) { LOG_ALLOC("Parcel %p: restart from %zu to %zu capacity", this, mDataCapacity, desired); pthread_mutex_lock(&gParcelGlobalAllocSizeLock); gParcelGlobalAllocSize += desired;