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

Commit bdfd4885 authored by Andy McFadden's avatar Andy McFadden
Browse files

Check for NULL buffer in repeat-latest 

Repeating the most-recent buffer appears to fail when the producer
disconnects.  This adds a NULL check to avoid crashing.

Bug 10607920

Change-Id: Ied036004425f046fcf9c26303823681f3fddb99e
parent 95c03858

media/libstagefright/omx/GraphicBufferSource.cpp

+17 −0
Original line number Diff line number Diff line
@@ -384,6 +384,23 @@ bool GraphicBufferSource::repeatLatestSubmittedBuffer_l() { 
    if (mLatestSubmittedBufferId < 0 || mSuspended) {

        return false;

    }

    if (mBufferSlot[mLatestSubmittedBufferId] == NULL) {

        // This can happen if the remote side disconnects, causing

        // onBuffersReleased() to NULL out our copy of the slots.  The

        // buffer is gone, so we have nothing to show.

        //

        // To be on the safe side we try to release the buffer.

        ALOGD("repeatLatestSubmittedBuffer_l: slot was NULL");

        mBufferQueue->releaseBuffer(

                mLatestSubmittedBufferId,

                mLatestSubmittedBufferFrameNum,

                EGL_NO_DISPLAY,

                EGL_NO_SYNC_KHR,

                Fence::NO_FENCE);

        mLatestSubmittedBufferId = -1;

        mLatestSubmittedBufferFrameNum = 0;

        return false;

    }



    int cbi = findAvailableCodecBuffer_l();

    if (cbi < 0) {