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

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

Merge "Fix memory leak in error case" into klp-dev am: 5136b743 am:... 

Merge "Fix memory leak in error case" into klp-dev am: 5136b743 am: 60657857 am: 55057ab4 am: a2fbd251
am: 4bd71033

Change-Id: I159ed2c6b4184689517bf39d791cb516d505e4ed
parents 045c64fe 4bd71033

media/libstagefright/MPEG4Extractor.cpp

+1 −0
Original line number Diff line number Diff line
@@ -1184,6 +1184,7 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { 
            ALOGV("allocated pssh @ %p", pssh.data);

            ssize_t requested = (ssize_t) pssh.datalen;

            if (mDataSource->readAt(data_offset + 24, pssh.data, requested) < requested) {

                delete[] pssh.data;

                return ERROR_IO;

            }

            mPssh.push_back(pssh);