commit 1ca597f40999aef9e5528c2e4db4ffff7afc4e4c
author Vishnu Nair <vishnun@google.com> Tue May 02 01:40:46 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 02 01:40:46 2023 +0000
tree 780f928685991f5c91c6ce5fe98d3aed6590fa78
parent 0f6d31dda21c8085712c7428a0926d3ed0a53532
parent f10a87bddbe89067002dac8384311e191bb9d5f4

Merge "[sf] Fix crash caused by invalid access of mPreviouslyPresentedLayerStacks" into udc-dev

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index cb4885a..731b359 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -2885,7 +2885,10 @@
     }
 
     for (auto layer : mLayersWithBuffersRemoved) {
-        for (auto layerStack : layer->mPreviouslyPresentedLayerStacks) {
+        std::vector<ui::LayerStack> previouslyPresentedLayerStacks =
+                std::move(layer->mPreviouslyPresentedLayerStacks);
+        layer->mPreviouslyPresentedLayerStacks.clear();
+        for (auto layerStack : previouslyPresentedLayerStacks) {
             auto optDisplay = layerStackToDisplay.get(layerStack);
             if (optDisplay && !optDisplay->get()->isVirtual()) {
                 auto fence = getHwComposer().getPresentFence(optDisplay->get()->getPhysicalId());