commit 9d52f998792fae5c7f061c093e197f14c6361758
author Vishnu Nair <vishnun@google.com> Tue Mar 23 15:14:50 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 23 15:14:50 2021 +0000
tree 2cf53dc32a734b02c6579ae8ab27fa832f2ead07
parent 0d798696d8190863f807f283735a520b0e4b9059
parent 5faedf568d57786800072f6f0163fe652243208c

Merge "Fix releaseBufferCallback null pointer dereference" into sc-dev

libs/gui/SurfaceComposerClient.cpp

diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp
index 7dc5e85..e6b74d0 100644
--- a/libs/gui/SurfaceComposerClient.cpp
+++ b/libs/gui/SurfaceComposerClient.cpp
@@ -292,8 +292,11 @@
                 // callback and a release buffer callback happening at the same time to avoid an
                 // additional ipc call from the server.
                 if (surfaceStats.previousBufferId) {
-                    ReleaseBufferCallback callback =
-                            popReleaseBufferCallbackLocked(surfaceStats.previousBufferId);
+                    ReleaseBufferCallback callback;
+                    {
+                        std::scoped_lock<std::mutex> lock(mMutex);
+                        callback = popReleaseBufferCallbackLocked(surfaceStats.previousBufferId);
+                    }
                     if (callback) {
                         callback(surfaceStats.previousBufferId,
                                  surfaceStats.previousReleaseFence