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

Commit c5917626 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix potential nullptr dereference" into udc-dev

parents ddce5f1d 95ec2cda

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.