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

Commit 29f09eb2 authored by Robert Shih's avatar Robert Shih Committed by android-build-merger
Browse files

Merge \\\"OMXCodec: check IMemory::pointer() before using allocation\\\" into... 

Merge \\\"OMXCodec: check IMemory::pointer() before using allocation\\\" into klp-dev am: f545c72b am: d89781f3
am: c9c40b82

Change-Id: I5facfd78f7050928d30c86585036128749b1f292
parents b7ba49c1 c9c40b82

media/libstagefright/OMXCodec.cpp

+3 −1
Original line number Diff line number Diff line
@@ -1656,7 +1656,9 @@ status_t OMXCodec::allocateBuffersOnPort(OMX_U32 portIndex) { 


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

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

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

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

            return NO_MEMORY;

        }



        BufferInfo info;

        info.mData = NULL;