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

Commit 877c76ac authored by Chong Zhang's avatar Chong Zhang Committed by Android (Google) Code Review
Browse files

Merge "stagefright: check IMemory::pointer() before using the allocation" into klp-dev

parents f97b6bee 8ec845c8

media/libstagefright/ACodec.cpp

+6 −2
Original line number Original line Diff line number Diff line
@@ -499,7 +499,9 @@ status_t ACodec::allocateBuffersOnPort(OMX_U32 portIndex) { 




            for (OMX_U32 i = 0; i < def.nBufferCountActual; ++i) {

            for (OMX_U32 i = 0; i < def.nBufferCountActual; ++i) {

                sp<IMemory> mem = mDealer[portIndex]->allocate(def.nBufferSize);

                sp<IMemory> mem = mDealer[portIndex]->allocate(def.nBufferSize);

                CHECK(mem.get() != NULL);

                if (mem == NULL || mem->pointer() == NULL) {

                    return NO_MEMORY;

                }





                BufferInfo info;

                BufferInfo info;

                info.mStatus = BufferInfo::OWNED_BY_US;

                info.mStatus = BufferInfo::OWNED_BY_US;
@@ -756,7 +758,9 @@ status_t ACodec::allocateOutputMetaDataBuffers() { 




        sp<IMemory> mem = mDealer[kPortIndexOutput]->allocate(

        sp<IMemory> mem = mDealer[kPortIndexOutput]->allocate(

                sizeof(struct VideoDecoderOutputMetaData));

                sizeof(struct VideoDecoderOutputMetaData));

        CHECK(mem.get() != NULL);

        if (mem == NULL || mem->pointer() == NULL) {

            return NO_MEMORY;

        }

        info.mData = new ABuffer(mem->pointer(), mem->size());

        info.mData = new ABuffer(mem->pointer(), mem->size());





        // we use useBuffer for metadata regardless of quirks

        // we use useBuffer for metadata regardless of quirks