commit 102b3e3f7c7d2474f86895caa9778d4cd330f1b5
author Chong Zhang <chz@google.com> Mon Nov 02 12:21:50 2020 -0800
committer Chong Zhang <chz@google.com> Mon Nov 02 12:25:28 2020 -0800
tree 620680fef4da4508159ad0c88e7ba78cc5aa440f
parent a5db26d13a9851beb7376dec25019f7a56d7c7b9

Fix use-after-free in ResourceManagerService::removeResource

bug: 171814518
test: ResourceManagerService unit tests; code inspection shows
      use-after-free and should be fixed by change.
Change-Id: I43c4a75b35d274cc1c568f60f13f65f4d4470ddd

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.