Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4faa32be authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "SurfaceUtils: ensure lock() grants a valid pointer" into main am: 0d238df7 am: d9182331 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2874840



Change-Id: I7ed4595f8206de01d406e6837ac2437a6cb22c71
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0b135d19 d9182331

media/libstagefright/SurfaceUtils.cpp

+5 −0
Original line number Original line Diff line number Diff line
@@ -298,6 +298,11 @@ status_t pushBlankBuffersToNativeWindow(ANativeWindow *nativeWindow /* nonnull * 
            ALOGE("error pushing blank frames: lock failed: %s (%d)", strerror(-err), -err);

            ALOGE("error pushing blank frames: lock failed: %s (%d)", strerror(-err), -err);

            break;

            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;

        *img = 0;