[FFmpeg-cvslog] avformat/sccdec: Fix memleak upon read header failure

Andreas Rheinhardt git at videolan.org
Mon Jun 15 18:43:57 EEST 2020


ffmpeg | branch: release/4.3 | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Sun Jun 14 03:22:32 2020 +0200| [bf29cf8eb6f5fadcec2c32522612eb0c453e2581] | committer: Andreas Rheinhardt

avformat/sccdec: Fix memleak upon read header failure

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>
(cherry picked from commit f3c63e67bb00fa7d96595203d01a576df651e275)

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

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

diff --git a/libavformat/sccdec.c b/libavformat/sccdec.c
index b9042b39ac..df4c94a6ea 100644
--- a/libavformat/sccdec.c
+++ b/libavformat/sccdec.c
@@ -136,7 +136,7 @@ try_again:
 
         sub = ff_subtitles_queue_insert(&scc->q, out, i, 0);
         if (!sub)
-            return AVERROR(ENOMEM);
+            goto fail;
 
         sub->pos = current_pos;
         sub->pts = ts_start;
@@ -155,6 +155,9 @@ try_again:
     ff_subtitles_queue_finalize(s, &scc->q);
 
     return ret;
+fail:
+    ff_subtitles_queue_clean(&scc->q);
+    return AVERROR(ENOMEM);
 }
 
 static int scc_read_packet(AVFormatContext *s, AVPacket *pkt)



More information about the ffmpeg-cvslog mailing list