Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 645d5c72 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix use-after-free in ResourceManagerService::removeResource" am: 65dbec91 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12969763

Change-Id: If4462481d8f9049897276cef4fad365b63a7a54c
parents 20169f38 65dbec91

services/mediaresourcemanager/ResourceManagerService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -511,8 +511,8 @@ Status ResourceManagerService::removeResource( 
                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.