[FFmpeg-devel] [PATCH 19/26] avformat/subviewer1dec: Fix memleak upon read header failure

Andreas Rheinhardt andreas.rheinhardt at gmail.com
Mon Jun 15 01:36:49 EEST 2020


The already parsed subtitles (contained in an FFDemuxSubtitlesQueue)
would leak if an error happened upon reading a subsequent subtitle.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
---
 libavformat/subviewer1dec.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavformat/subviewer1dec.c b/libavformat/subviewer1dec.c
index 1360d9b7d9..f2eee294a1 100644
--- a/libavformat/subviewer1dec.c
+++ b/libavformat/subviewer1dec.c
@@ -77,8 +77,10 @@ static int subviewer1_read_header(AVFormatContext *s)
                     sub->duration = pts_start - sub->pts;
             } else {
                 sub = ff_subtitles_queue_insert(&subviewer1->q, line, len, 0);
-                if (!sub)
+                if (!sub) {
+                    ff_subtitles_queue_clean(&subviewer1->q);
                     return AVERROR(ENOMEM);
+                }
                 sub->pos = pos;
                 sub->pts = pts_start;
                 sub->duration = -1;
-- 
2.20.1



More information about the ffmpeg-devel mailing list