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

Commit c8e70a85 authored by Danny Baumann's avatar Danny Baumann
Browse files

Fix crashes on video playback. 

Change I8ee9162536da5711e383dd1d89dca4fa1da107be missed correct variable
initializations at one of two places, which led to a null pointer
dereference. This patch fixes that.
It also updates the variable that stores the original allocated length
to be of the same type as used in the OMX buffer header.

Change-Id: I15b083da8565ec3e8769d18ba1f19d3b12f54cb1
parent 9788e7f5

include/media/stagefright/OMXCodec.h

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ private: 
        void *mData;

        MediaBuffer *mMediaBuffer;

        OMX_U8 *mAllocatedBuffer;

        size_t mAllocatedSize;

        OMX_U32 mAllocatedSize;

    };



    struct CodecSpecificData {

media/libstagefright/OMXCodec.cpp

+2 −0
Original line number Diff line number Diff line
@@ -2629,6 +2629,8 @@ status_t OMXCodec::allocateOutputBuffersFromNativeWindow() { 
        info.mSize = def.nBufferSize;

        info.mStatus = OWNED_BY_US;

        info.mMem = NULL;

        info.mAllocatedBuffer = NULL;

        info.mAllocatedSize = 0;

        info.mMediaBuffer = new MediaBuffer(graphicBuffer);

        info.mMediaBuffer->setObserver(this);

        mPortBuffers[kPortIndexOutput].push(info);