virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-28 12:32:17 +02:00
Code Issues Releases Activity

avformat/sccdec: Fix memleak upon read header failure

Browse Source 
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>
(cherry picked from commit f3c63e67bb00fa7d96595203d01a576df651e275)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-06-14 03:22:32 +02:00
parent 97e3d91f4d
commit abf63fef43
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/sccdec.c
View File

@ -132,7 +132,7 @@ static int scc_read_header(AVFormatContext *s)
sub = ff_subtitles_queue_insert(&scc->q, out, i, 0); sub = ff_subtitles_queue_insert(&scc->q, out, i, 0);
if (!sub) if (!sub)
return AVERROR(ENOMEM); goto fail;
sub->pos = pos; sub->pos = pos;
sub->pts = ts_start; sub->pts = ts_start;
@ -144,6 +144,9 @@ static int scc_read_header(AVFormatContext *s)
ff_subtitles_queue_finalize(s, &scc->q); ff_subtitles_queue_finalize(s, &scc->q);
return ret; return ret;
fail:
ff_subtitles_queue_clean(&scc->q);
return AVERROR(ENOMEM);
} }
static int scc_read_packet(AVFormatContext *s, AVPacket *pkt) static int scc_read_packet(AVFormatContext *s, AVPacket *pkt)