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

Commit 3916eb59 authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Merge "Fix potential leak" into mnc-dev am: 167af356 am: 39336ac8 am:... 

Merge "Fix potential leak" into mnc-dev am: 167af356 am: 39336ac8 am: 1adfafdf am: 781d2a75 am: 8c96e871 am: 015ed4cd am: 03c4e00b am: d2972602
am: 60a16051

Change-Id: Id565f7e9f7e53a09335e468d82d1a04424aabe63
parents ed71873a 60a16051

media/libstagefright/MPEG4Extractor.cpp

+3 −1
Original line number Diff line number Diff line
@@ -2828,8 +2828,10 @@ status_t MPEG4Extractor::parseITunesMetaData(off64_t offset, size_t size) { 
                    int32_t delay, padding;

                    if (sscanf(mLastCommentData,

                               " %*x %x %x %*x", &delay, &padding) == 2) {

                        if (mLastTrack == NULL)

                        if (mLastTrack == NULL) {

                            delete[] buffer;

                            return ERROR_MALFORMED;

                        }



                        mLastTrack->meta->setInt32(kKeyEncoderDelay, delay);

                        mLastTrack->meta->setInt32(kKeyEncoderPadding, padding);