| commit | 2688c3b10f51989fb3ee8b8be6fa25b203c82aa8 | [log] [tgz] |
|---|---|---|
| author | Henry Fang <quxiangfang@google.com> | Tue Jun 30 04:26:32 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 30 04:26:32 2020 +0000 |
| tree | a2da4b17dfbaabe059a8a93ea9dceb6c19c5fbdd | |
| parent | 3778ba122ff9514a515c3cd5fe367bff6a03184e [diff] | |
| parent | bf0d7ca7e4314ae3e7bd33e379f5d973843b19ce [diff] |
Fix use after free issue am: bf0d7ca7e4 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12038058 Change-Id: Id7b98f16538c7ca9ff38ee8896fc7a64242ac901
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>