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

Commit 9dc58f6d 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 am: dd2f7e98 am: 00be42f3 am: e4b59cb2 am: 15f22446 am: 6721b029 am: 7c3b4754 am: 0967b342 am: b47837e3 am: cc8ee0ef am: 1182c9d9
am: 65098155

Change-Id: Ife8dcb8f0a49898e44dafe75177617cb5adc1cc7
parents aef8eb86 65098155

media/libstagefright/MPEG4Extractor.cpp

+1 −0
Original line number Diff line number Diff line
@@ -1240,6 +1240,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);