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

Commit 55057ab4 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: 60657857

Change-Id: I1564d4e2626a31b7018bae301c50a268ccc79749
parents 086cee9d 60657857

media/libstagefright/MPEG4Extractor.cpp

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

            ALOGV("allocated pssh @ %p", pssh.data);

            ssize_t requested = (ssize_t) pssh.datalen;

            ssize_t requested = (ssize_t) pssh.datalen;

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

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

                delete[] pssh.data;

                return ERROR_IO;

                return ERROR_IO;

            }

            }

            mPssh.push_back(pssh);

            mPssh.push_back(pssh);