[FFmpeg-cvslog] avformat/mov: Fix memleak upon encountering repeating tags

Andreas Rheinhardt git at videolan.org
Mon Jun 15 18:44:17 EEST 2020

ffmpeg | branch: release/4.3 | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Sun Jun 14 09:19:38 2020 +0200| [9d921e38f436a431e6d457fe7e4700878e7327b9] | committer: Andreas Rheinhardt

avformat/mov: Fix memleak upon encountering repeating tags

mov_read_custom tries to read three strings belonging to three different
tags. When an already encountered tag is encountered again, a new buffer
for the string to be read is allocated and stored in the pointer
destined for this particular tag. But in this scenario, said pointer
already holds the address of the string read earlier, leading to a leak.

This commit therefore aborts the reading process upon encountering
an already encountered tag.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
(cherry picked from commit dfef1d5e3cd4dfead84416a01e6c9ff0da50b34d)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9d921e38f436a431e6d457fe7e4700878e7327b9

 libavformat/mov.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 47bbb3697d..a59c804d16 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -4434,6 +4434,9 @@ static int mov_read_custom(MOVContext *c, AVIOContext *pb, MOVAtom atom)
         } else
+        if (*p)
+            break;
         *p = av_malloc(len + 1);
         if (!*p) {
             ret = AVERROR(ENOMEM);

More information about the ffmpeg-cvslog mailing list