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

Commit ab4877b4 authored by Chong Zhang's avatar Chong Zhang Committed by Automerger Merge Worker
Browse files

Merge "Fix potential null ptr after low memory" into sc-dev am: 504f1761 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/14161966

Change-Id: Id8b1ea4aaf03d5d75b965a077b3e847cf5a0fc5a
parents fad46d70 504f1761

media/libstagefright/FrameDecoder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ sp<IMemory> allocVideoFrame(const sp<MetaData>& trackMeta, 
        return NULL;

    }

    sp<IMemory> frameMem = new MemoryBase(heap, 0, size);

    if (frameMem == NULL) {

    if (frameMem == NULL || frameMem->unsecurePointer() == NULL) {

        ALOGE("not enough memory for VideoFrame size=%zu", size);

        return NULL;

    }