virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity

avformat/pjsdec: 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 9df560e898)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-06-14 03:21:03 +02:00
parent 368aa756c4
commit 1e13ef6c90
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/pjsdec.c
View File

@ -94,8 +94,10 @@ static int pjs_read_header(AVFormatContext *s)
p[strcspn(p, "\"")] = 0; p[strcspn(p, "\"")] = 0;
sub = ff_subtitles_queue_insert(&pjs->q, p, strlen(p), 0); sub = ff_subtitles_queue_insert(&pjs->q, p, strlen(p), 0);
if (!sub) if (!sub) {
ff_subtitles_queue_clean(&pjs->q);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
}
sub->pos = pos; sub->pos = pos;
sub->pts = pts_start; sub->pts = pts_start;
sub->duration = duration; sub->duration = duration;