| commit | 0ead596847181ff41eb2b6a46a8170ebf79de0ae | [log] [tgz] |
|---|---|---|
| author | Henry Fang <quxiangfang@google.com> | Tue Jun 30 04:56:49 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 30 04:56:49 2020 +0000 |
| tree | a6db3d9312fd467f8e666b7fa4d08b8dc0530c22 | |
| parent | 820859b688918e7a69d99c9ff583a7432660fdea [diff] | |
| parent | e11559dbd508135a4db819dbaf811b41ceb1eb85 [diff] |
Fix use after free issue am: bf0d7ca7e4 am: 2688c3b10f am: e11559dbd5 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12038058 Change-Id: I571e76eca7154e15be3fd343a894614b1c0799a6
diff --git a/services/mediaresourcemanager/ResourceManagerService.cpp b/services/mediaresourcemanager/ResourceManagerService.cpp index ff45c87..3d36f8e 100644 --- a/services/mediaresourcemanager/ResourceManagerService.cpp +++ b/services/mediaresourcemanager/ResourceManagerService.cpp
@@ -57,9 +57,11 @@ ALOGW("ResourceManagerService is dead as well."); return; } - service->removeResource(mPid, mClientId, false); service->overridePid(mPid, -1); + // thiz is freed in the call below, so it must be last call referring thiz + service->removeResource(mPid, mClientId, false); + } template <typename T>