virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

avformat/subviewer1dec: 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 9751d75152)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-06-14 03:26:40 +02:00
parent 688b46d1fa
commit 2d42cb8423
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/subviewer1dec.c
View File

@ -77,8 +77,10 @@ static int subviewer1_read_header(AVFormatContext *s)
sub->duration = pts_start - sub->pts; sub->duration = pts_start - sub->pts;
} else { } else {
sub = ff_subtitles_queue_insert(&subviewer1->q, line, len, 0); sub = ff_subtitles_queue_insert(&subviewer1->q, line, len, 0);
if (!sub) if (!sub) {
ff_subtitles_queue_clean(&subviewer1->q);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
}
sub->pos = pos; sub->pos = pos;
sub->pts = pts_start; sub->pts = pts_start;
sub->duration = -1; sub->duration = -1;