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

[Andreas Rheinhardt]

ffmpeg | branch: release/4.2 | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Sun Jun 14 03:22:32 2020 +0200| [6b7af5991ae6501afcaf911f8fc7a02eb758b09c] | 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)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>

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

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

diff --git a/libavformat/sccdec.c b/libavformat/sccdec.c
index 412d8aaf49..b0b3ac1005 100644
--- a/libavformat/sccdec.c
+++ b/libavformat/sccdec.c
@@ -133,7 +133,7 @@ try_again:
 
         sub = ff_subtitles_queue_insert(&scc->q, out, i, 0);
         if (!sub)
-            return AVERROR(ENOMEM);
+            goto fail;
 
         sub->pos = pos;
         sub->pts = ts_start;
@@ -149,6 +149,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)