[FFmpeg-devel] [PATCH 2/5] avformat/mov: Fix memleak

Andreas Rheinhardt andreas.rheinhardt at gmail.com
Mon Sep 16 18:54:59 EEST 2019


When the mov/mp4 demuxer encounters an error during decrypting a packet,
it returns the error, yet doesn't free the packet, so that the packet
leaks. This has been fixed in this commit.

Fixes the memleaks from ticket #8150.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
---
This only fixes the memleaks from #8150. I can't reproduce the
uninitialized reads, so I can't do anything about them. Can someone else
reproduce them?

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

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 675b915906..cd3f5bffcf 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -7843,8 +7843,10 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt)
         aax_filter(pkt->data, pkt->size, mov);
 
     ret = cenc_filter(mov, st, sc, pkt, current_index);
-    if (ret < 0)
+    if (ret < 0) {
+        av_packet_unref(pkt);
         return ret;
+    }
 
     return 0;
 }
-- 
2.20.1



More information about the ffmpeg-devel mailing list