commit a5a942a006a80231f3216e0d875ea91f922ff079
author Patrick Williams <pdwilliams@google.com> Tue Sep 05 17:28:25 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 05 17:28:25 2023 +0000
tree 9fb11d38bee576d302878c442148e645c9524a9f
parent 89270bc7589e467ef71b9844c7b27809c0a31e14
parent 38d920ef740e4d67edb68de5e53341ca2a8d6ca0

Merge "Fix nullptr dereference when reporting hung transaction" into udc-qpr-dev

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 55aaa25..4928a5c 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -4557,6 +4557,9 @@
             resolvedState.externalTexture =
                     getExternalTextureFromBufferData(*resolvedState.state.bufferData,
                                                      layerName.c_str(), transactionId);
+            if (resolvedState.externalTexture) {
+                resolvedState.state.bufferData->buffer = resolvedState.externalTexture->getBuffer();
+            }
             mBufferCountTracker.increment(resolvedState.state.surface->localBinder());
         }
         resolvedState.layerId = LayerHandle::getLayerId(resolvedState.state.surface);