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

Commit a92896f6 authored by James Dong's avatar James Dong Committed by Android (Google) Code Review
Browse files

Merge "Fix a mediaserver crash caused by dereferencing a NULL pointer." into jb-dev

parents 9ec3547e 21a0dca4

media/libstagefright/OMXCodec.cpp

+5 −5
Original line number Diff line number Diff line
@@ -3148,11 +3148,6 @@ bool OMXCodec::drainInputBuffer(BufferInfo *info) { 
        mNoMoreOutputData = false;

    }



    CODEC_LOGV("Calling emptyBuffer on buffer %p (length %d), "

               "timestamp %lld us (%.2f secs)",

               info->mBuffer, offset,

               timestampUs, timestampUs / 1E6);



    if (info == NULL) {

        CHECK(mFlags & kUseSecureInputBuffers);

        CHECK(signalEOS);
@@ -3163,6 +3158,11 @@ bool OMXCodec::drainInputBuffer(BufferInfo *info) { 
        info = findEmptyInputBuffer();

    }



    CODEC_LOGV("Calling emptyBuffer on buffer %p (length %d), "

               "timestamp %lld us (%.2f secs)",

               info->mBuffer, offset,

               timestampUs, timestampUs / 1E6);



    err = mOMX->emptyBuffer(

            mNode, info->mBuffer, 0, offset,

            flags, timestampUs);