commit dd1549c8af9f160ae157407c705ad65b12a1b68b
author Henry Fang <quxiangfang@google.com> Mon Jun 29 21:38:49 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 29 21:38:49 2020 +0000
tree 8a6a26671c5880cd576de768a911e6b7870d3941
parent 65589dfd429d5ca47fa6c593fa414506d564b67e
parent b35141c641f319ea0568fedcaab37eaacae84828

Merge "Fix use after free issue"

services/mediaresourcemanager/ResourceManagerService.cpp

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>