[FFmpeg-cvslog] avformat/mov: Free encryption data on error

Andreas Rheinhardt git at videolan.org
Wed May 20 12:15:51 EEST 2020


ffmpeg | branch: release/4.2 | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Mon Jan 27 09:28:18 2020 +0100| [09d2b9b7bedb1e95a5aa365794c02fb5dd183025] | committer: Andreas Rheinhardt

avformat/mov: Free encryption data on error

Fixes memleak and Coverity issue #1439587.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 3999c4b374c2f3786137bd7e820dd1555fc20d90)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=09d2b9b7bedb1e95a5aa365794c02fb5dd183025
---

 libavformat/mov.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 2e726d3e90..0a9abaa795 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -6310,8 +6310,10 @@ static int mov_read_pssh(MOVContext *c, AVIOContext *pb, MOVAtom atom)
 
     if (version > 0) {
         kid_count = avio_rb32(pb);
-        if (kid_count >= INT_MAX / sizeof(*key_ids))
-            return AVERROR(ENOMEM);
+        if (kid_count >= INT_MAX / sizeof(*key_ids)) {
+            ret = AVERROR(ENOMEM);
+            goto finish;
+        }
 
         for (unsigned int i = 0; i < kid_count && !pb->eof_reached; i++) {
             unsigned int min_kid_count = FFMIN(FFMAX(i + 1, 1024), kid_count);



More information about the ffmpeg-cvslog mailing list