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

Commit 0d238df7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 423dc1a0 2594d490

media/libstagefright/SurfaceUtils.cpp

+5 −0
Original line number 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);

            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;