mirror of https://git.ffmpeg.org/ffmpeg.git
avformat/microdvddec: Fix memleak upon read header failure
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:
parent
8201fd9a8a
commit
f6b9f7531c
|
@ -81,7 +81,7 @@ static int microdvd_read_header(AVFormatContext *s)
|
|||
AVRational pts_info = (AVRational){ 2997, 125 }; /* default: 23.976 fps */
|
||||
MicroDVDContext *microdvd = s->priv_data;
|
||||
AVStream *st = avformat_new_stream(s, NULL);
|
||||
int i = 0;
|
||||
int i = 0, ret;
|
||||
char line_buf[MAX_LINESIZE];
|
||||
int has_real_fps = 0;
|
||||
|
||||
|
@ -116,8 +116,10 @@ static int microdvd_read_header(AVFormatContext *s)
|
|||
}
|
||||
if (!st->codecpar->extradata && sscanf(line, "{DEFAULT}{}%c", &c) == 1) {
|
||||
st->codecpar->extradata = av_strdup(line + 11);
|
||||
if (!st->codecpar->extradata)
|
||||
return AVERROR(ENOMEM);
|
||||
if (!st->codecpar->extradata) {
|
||||
ret = AVERROR(ENOMEM);
|
||||
goto fail;
|
||||
}
|
||||
st->codecpar->extradata_size = strlen(st->codecpar->extradata) + 1;
|
||||
continue;
|
||||
}
|
||||
|
@ -135,8 +137,10 @@ static int microdvd_read_header(AVFormatContext *s)
|
|||
if (!*p)
|
||||
continue;
|
||||
sub = ff_subtitles_queue_insert(µdvd->q, p, strlen(p), 0);
|
||||
if (!sub)
|
||||
return AVERROR(ENOMEM);
|
||||
if (!sub) {
|
||||
ret = AVERROR(ENOMEM);
|
||||
goto fail;
|
||||
}
|
||||
sub->pos = pos;
|
||||
sub->pts = get_pts(line);
|
||||
sub->duration = get_duration(line);
|
||||
|
@ -153,6 +157,9 @@ static int microdvd_read_header(AVFormatContext *s)
|
|||
st->codecpar->codec_type = AVMEDIA_TYPE_SUBTITLE;
|
||||
st->codecpar->codec_id = AV_CODEC_ID_MICRODVD;
|
||||
return 0;
|
||||
fail:
|
||||
ff_subtitles_queue_clean(µdvd->q);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int microdvd_read_packet(AVFormatContext *s, AVPacket *pkt)
|
||||
|
|
Loading…
Reference in New Issue