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

Commit f870728e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix potential nullptr dereference" into udc-dev am: c5917626 

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



Change-Id: I138c97bc0f3f2103bd10b8335615a6235cb10310
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6016d6f0 c5917626

media/libstagefright/FrameDecoder.cpp

+3 −0
Original line number Diff line number Diff line
@@ -240,6 +240,9 @@ sp<IMemory> FrameDecoder::getMetadataOnly( 


    sp<IMemory> metaMem =

            allocMetaFrame(trackMeta, width, height, tileWidth, tileHeight, dstBpp, bitDepth);

    if (metaMem == nullptr) {

        return NULL;

    }



    // try to fill sequence meta's duration based on average frame rate,

    // default to 33ms if frame rate is unavailable.