commit 38d920ef740e4d67edb68de5e53341ca2a8d6ca0
author Patrick Williams <pdwilliams@google.com> Thu Aug 31 17:31:18 2023 -0500
committer Patrick Williams <pdwilliams@google.com> Thu Aug 31 17:53:15 2023 -0500
tree 5556f43555bf3f0db0b3800aa6744a907542209e
parent 122399956ddc26ef99a2053717a71cee8c3d7a73

Fix nullptr dereference when reporting hung transaction

Bug: 297633920
Test: presumbits
Change-Id: I81ee93ec17324c2305a17196df9c5f725d479741

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index c61f2a1..5e5ceb6 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -4554,6 +4554,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);