diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-06-14 03:22:32 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-06-15 16:54:06 +0200 |
| commit | f3c63e67bb00fa7d96595203d01a576df651e275 (patch) | |
| tree | 1f4d51cf76bfaf01f9c5d3e6026fb87fc8696771 | |
| parent | f161f8e4ad10c8ae5b2e97870e09bc6a421408eb (diff) | |
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@gmail.com>
| -rw-r--r-- | libavformat/sccdec.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavformat/sccdec.c b/libavformat/sccdec.c index 0eb1dd307e..72f47f70de 100644 --- a/libavformat/sccdec.c +++ b/libavformat/sccdec.c @@ -144,7 +144,7 @@ try_again: sub = ff_subtitles_queue_insert(&scc->q, out, i, 0); if (!sub) - return AVERROR(ENOMEM); + goto fail; current_pos += i; sub->pos = current_pos; @@ -159,7 +159,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; @@ -178,6 +178,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) |