SurfaceUtils: ensure lock() grants a valid pointer

Sometimes lock() of GraphicBuffer does not grants a valid mapping pointer though the return value is NO_ERROR. Regards this case as an error. Bug: 303816969 Change-Id: I95d2a583dd8fdd117534f349d9f9e71323792bd7 Signed-off-by: Hưng Phan <[email protected]>
CherishOS · Dec 17, 2023 · b07f6e5 · b07f6e5
1 parent 268c4a8
commit b07f6e5
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/media/libstagefright/SurfaceUtils.cpp b/media/libstagefright/SurfaceUtils.cpp
@@ -299,6 +299,11 @@ status_t pushBlankBuffersToNativeWindow(ANativeWindow *nativeWindow /* nonnull *
             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;