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

Commit aa979c7c authored by Chong Zhang's avatar Chong Zhang
Browse files

Fix potential null ptr after low memory 

bug: 180962323
test: atest android.media.cts.MediaMetadataRetrieverTest
Change-Id: Iac064687e55912d9eff4e30823ad5694f48c27e6
parent d8e0c1f8

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;

    }