commit 0d238df741687e4205546a0b682e5d69e0514f40
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Sat Jan 13 08:16:45 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Jan 13 08:16:45 2024 +0000
tree d808d1b0ad2ee10acb5756731f81e254757e549d
parent 423dc1a0f09e4d9903da0b3f22ead44c44232e78
parent 2594d490ebe8733f27b88a943a9a81a57531c708

Merge "SurfaceUtils: ensure lock() grants a valid pointer" into main

media/libstagefright/SurfaceUtils.cpp

diff --git a/media/libstagefright/SurfaceUtils.cpp b/media/libstagefright/SurfaceUtils.cpp
index f16e635..604dcb0 100644
--- a/media/libstagefright/SurfaceUtils.cpp
+++ b/media/libstagefright/SurfaceUtils.cpp
@@ -298,6 +298,11 @@
             ALOGE("error pushing blank frames: lock failed: %s (%d)", strerror(-err), -err);
             break;
         }
+        if (img == nullptr) {
+            (void)buf->unlock(); // Since lock() was successful.
+            ALOGE("error pushing blank frames: lock succeeded: buf mapping is nullptr");
+            break;
+        }
 
         *img = 0;