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

avformat/microdvddec: 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
or when allocating extradata.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
(cherry picked from commit b12014a5b8)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt
2020-06-14 03:16:15 +02:00
parent b30fea143b
commit a580268fe3
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libavformat/microdvddec.c
View File

@@ -81,7 +81,7 @@ static int microdvd_read_header(AVFormatContext *s)
AVRational pts_info = (AVRational){ 2997, 125 }; /* default: 23.976 fps */ AVRational pts_info = (AVRational){ 2997, 125 }; /* default: 23.976 fps */
MicroDVDContext *microdvd = s->priv_data; MicroDVDContext *microdvd = s->priv_data;
AVStream *st = avformat_new_stream(s, NULL); AVStream *st = avformat_new_stream(s, NULL);
int i = 0; int i = 0, ret;
char line_buf[MAX_LINESIZE]; char line_buf[MAX_LINESIZE];
int has_real_fps = 0; int has_real_fps = 0;
@@ -117,8 +117,10 @@ static int microdvd_read_header(AVFormatContext *s)
} }
if (!st->codecpar->extradata && sscanf(line, "{DEFAULT}{}%c", &c) == 1) { if (!st->codecpar->extradata && sscanf(line, "{DEFAULT}{}%c", &c) == 1) {
st->codecpar->extradata = av_strdup(line + 11); st->codecpar->extradata = av_strdup(line + 11);
if (!st->codecpar->extradata) if (!st->codecpar->extradata) {
return AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto fail;
}
st->codecpar->extradata_size = strlen(st->codecpar->extradata) + 1; st->codecpar->extradata_size = strlen(st->codecpar->extradata) + 1;
continue; continue;
} }
@@ -139,8 +141,10 @@ static int microdvd_read_header(AVFormatContext *s)
if (pts == AV_NOPTS_VALUE) if (pts == AV_NOPTS_VALUE)
continue; continue;
sub = ff_subtitles_queue_insert(&microdvd->q, p, strlen(p), 0); sub = ff_subtitles_queue_insert(&microdvd->q, p, strlen(p), 0);
if (!sub) if (!sub) {
return AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto fail;
}
sub->pos = pos; sub->pos = pos;
sub->pts = pts; sub->pts = pts;
sub->duration = get_duration(line); sub->duration = get_duration(line);
@@ -157,6 +161,9 @@ static int microdvd_read_header(AVFormatContext *s)
st->codecpar->codec_type = AVMEDIA_TYPE_SUBTITLE; st->codecpar->codec_type = AVMEDIA_TYPE_SUBTITLE;
st->codecpar->codec_id = AV_CODEC_ID_MICRODVD; st->codecpar->codec_id = AV_CODEC_ID_MICRODVD;
return 0; return 0;
fail:
ff_subtitles_queue_clean(&microdvd->q);
return ret;
} }
static int microdvd_read_packet(AVFormatContext *s, AVPacket *pkt) static int microdvd_read_packet(AVFormatContext *s, AVPacket *pkt)