commit 65dbec91f9ca64014d6cb5ecf148cf2f4b3bb52d
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Nov 04 20:46:06 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 04 20:46:06 2020 +0000
tree d234fd70c49d418104db6c4cb4bb7a6b92770b04
parent aa24ee6f6ecd9e09848ccad713e1941bb25417ae
parent 102b3e3f7c7d2474f86895caa9778d4cd330f1b5

Merge "Fix use-after-free in ResourceManagerService::removeResource"

services/mediaresourcemanager/ResourceManagerService.cpp

diff --git a/services/mediaresourcemanager/ResourceManagerService.cpp b/services/mediaresourcemanager/ResourceManagerService.cpp
index 7bb606e..32ac583 100644
--- a/services/mediaresourcemanager/ResourceManagerService.cpp
+++ b/services/mediaresourcemanager/ResourceManagerService.cpp
@@ -511,8 +511,8 @@
                 resource.value -= res.value;
             } else {
                 onLastRemoved(res, info);
-                info.resources.erase(resType);
                 actualRemoved.value = resource.value;
+                info.resources.erase(resType);
             }
 
             // Add it to the list of removed resources for observers.