Fix memory leak in error case

marcone · andi34 · commit 4ad5b9142c29 · 2017-07-17T21:44:14.000+02:00
Bug: 37239013 AOSP-Change-Id: Ic33e0f7ed946d0729efa46f69aff1a5d35e81b1e (cherry picked from commit ab34612) Change-Id: I8292502e9668ccafb298e29a13f226b3f2785be6
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
@@ -1140,6 +1140,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);

Original file line number	Diff line number	Diff line change
`@@ -1140,6 +1140,7 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) {`
`1140`	`1140`	`ALOGV("allocated pssh @ %p", pssh.data);`
`1141`	`1141`	`ssize_t requested = (ssize_t) pssh.datalen;`
`1142`	`1142`	`if (mDataSource->readAt(data_offset + 24, pssh.data, requested) < requested) {`
	`1143`	`+ delete[] pssh.data;`
`1143`	`1144`	`return ERROR_IO;`
`1144`	`1145`	`}`
`1145`	`1146`	`mPssh.push_back(pssh);`