highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/jacosubdec: 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 c13a752733a9af955b032c55f704b748fe37dd19)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-06-14 03:09:08 +02:00
parent 80b4dd41ff
commit 1a01d3cbb8
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/jacosubdec.c
View File

@ -187,8 +187,10 @@ static int jacosub_read_header(AVFormatContext *s)
AVPacket *sub; AVPacket *sub;
sub = ff_subtitles_queue_insert(&jacosub->q, line, len, merge_line); sub = ff_subtitles_queue_insert(&jacosub->q, line, len, merge_line);
if (!sub) if (!sub) {
return AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto fail;
}
sub->pos = pos; sub->pos = pos;
merge_line = len > 1 && !strcmp(&line[len - 2], "\\\n"); merge_line = len > 1 && !strcmp(&line[len - 2], "\\\n");
continue; continue;