commit 82251b19e531ee3d182f79bf82d4d35eea390f5a
author Vishnu Nair <vishnun@google.com> Mon Nov 28 17:15:58 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 28 17:15:58 2022 +0000
tree 3cb60afa18f25d25ddd2dd2c8b81415426cdd233
parent c4f09efaab2145d6ffd7a2871ac6c23a9be3046f
parent aa548fdb280f58ca249f5c5d96b3911cda966abb

Merge "SF: Avoid accessing an invalidated iterator"

services/surfaceflinger/FrontEnd/LayerLifecycleManager.cpp

diff --git a/services/surfaceflinger/FrontEnd/LayerLifecycleManager.cpp b/services/surfaceflinger/FrontEnd/LayerLifecycleManager.cpp
index 1108246..7afa144 100644
--- a/services/surfaceflinger/FrontEnd/LayerLifecycleManager.cpp
+++ b/services/surfaceflinger/FrontEnd/LayerLifecycleManager.cpp
@@ -123,7 +123,11 @@
             ALOGV("%s destroyed layer %s", __func__, layer->getDebugStringShort().c_str());
             std::iter_swap(it, mLayers.end() - 1);
             mDestroyedLayers.emplace_back(std::move(mLayers.back()));
-            mLayers.erase(mLayers.end() - 1);
+            if (it == mLayers.end() - 1) {
+                it = mLayers.erase(mLayers.end() - 1);
+            } else {
+                mLayers.erase(mLayers.end() - 1);
+            }
         } else {
             it++;
         }