RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-23 03:17:30 +00:00
Code Issues Projects Releases Wiki Activity

avformat/matroskadec: Simplify cleanup after read_header failure

Browse Source 
by setting the FF_FMT_INIT_CLEANUP flag.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2020-03-21 18:31:06 +01:00
parent 7d0e70d372
commit d32a403102
1 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libavformat/matroskadec.c
View File

@ -796,8 +796,6 @@ static const CodecMime mkv_mime_tags[] = {
static const char *const matroska_doctypes[] = { "matroska", "webm" }; static const char *const matroska_doctypes[] = { "matroska", "webm" };
static int matroska_read_close(AVFormatContext *s);
/* /*
* This function prepares the status for parsing of level 1 elements. * This function prepares the status for parsing of level 1 elements.
*/ */
@ -2953,11 +2951,11 @@ static int matroska_read_header(AVFormatContext *s)
while (res != 1) { while (res != 1) {
res = matroska_resync(matroska, pos); res = matroska_resync(matroska, pos);
if (res < 0) if (res < 0)
goto fail; return res;
pos = avio_tell(matroska->ctx->pb); pos = avio_tell(matroska->ctx->pb);
res = ebml_parse(matroska, matroska_segment, matroska); res = ebml_parse(matroska, matroska_segment, matroska);
if (res == AVERROR(EIO)) // EOF is translated to EIO, this exists the loop on EOF if (res == AVERROR(EIO)) // EOF is translated to EIO, this exists the loop on EOF
goto fail; return res;
} }
/* Set data_offset as it might be needed later by seek_frame_generic. */ /* Set data_offset as it might be needed later by seek_frame_generic. */
if (matroska->current_id == MATROSKA_ID_CLUSTER) if (matroska->current_id == MATROSKA_ID_CLUSTER)
@ -2977,7 +2975,7 @@ static int matroska_read_header(AVFormatContext *s)
res = matroska_parse_tracks(s); res = matroska_parse_tracks(s);
if (res < 0) if (res < 0)
goto fail; return res;
attachments = attachments_list->elem; attachments = attachments_list->elem;
for (j = 0; j < attachments_list->nb_elem; j++) { for (j = 0; j < attachments_list->nb_elem; j++) {
@ -3006,7 +3004,7 @@ static int matroska_read_header(AVFormatContext *s)
if (st->codecpar->codec_id != AV_CODEC_ID_NONE) { if (st->codecpar->codec_id != AV_CODEC_ID_NONE) {
res = ff_add_attached_pic(s, st, NULL, &attachments[j].bin.buf, 0); res = ff_add_attached_pic(s, st, NULL, &attachments[j].bin.buf, 0);
if (res < 0) if (res < 0)
goto fail; return res;
} else { } else {
st->codecpar->codec_type = AVMEDIA_TYPE_ATTACHMENT; st->codecpar->codec_type = AVMEDIA_TYPE_ATTACHMENT;
if (ff_alloc_extradata(st->codecpar, attachments[j].bin.size)) if (ff_alloc_extradata(st->codecpar, attachments[j].bin.size))
@ -3041,9 +3039,6 @@ static int matroska_read_header(AVFormatContext *s)
matroska_convert_tags(s); matroska_convert_tags(s);
return 0; return 0;
fail:
matroska_read_close(s);
return res;
} }
/* /*
@ -4237,16 +4232,13 @@ static int webm_dash_manifest_read_header(AVFormatContext *s)
} }
if (!matroska->tracks.nb_elem || !s->nb_streams) { if (!matroska->tracks.nb_elem || !s->nb_streams) {
av_log(s, AV_LOG_ERROR, "No track found\n"); av_log(s, AV_LOG_ERROR, "No track found\n");
ret = AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
goto fail;
} }
if (!matroska->is_live) { if (!matroska->is_live) {
buf = av_asprintf("%g", matroska->duration); buf = av_asprintf("%g", matroska->duration);
if (!buf) { if (!buf)
ret = AVERROR(ENOMEM); return AVERROR(ENOMEM);
goto fail;
}
av_dict_set(&s->streams[0]->metadata, DURATION, av_dict_set(&s->streams[0]->metadata, DURATION,
buf, AV_DICT_DONT_STRDUP_VAL); buf, AV_DICT_DONT_STRDUP_VAL);
@ -4269,7 +4261,7 @@ static int webm_dash_manifest_read_header(AVFormatContext *s)
ret = webm_dash_manifest_cues(s, init_range); ret = webm_dash_manifest_cues(s, init_range);
if (ret < 0) { if (ret < 0) {
av_log(s, AV_LOG_ERROR, "Error parsing Cues\n"); av_log(s, AV_LOG_ERROR, "Error parsing Cues\n");
goto fail; return ret;
} }
} }
@ -4279,9 +4271,6 @@ static int webm_dash_manifest_read_header(AVFormatContext *s)
matroska->bandwidth, 0); matroska->bandwidth, 0);
} }
return 0; return 0;
fail:
matroska_read_close(s);
return ret;
} }
static int webm_dash_manifest_read_packet(AVFormatContext *s, AVPacket *pkt) static int webm_dash_manifest_read_packet(AVFormatContext *s, AVPacket *pkt)
@ -4308,6 +4297,7 @@ const AVInputFormat ff_matroska_demuxer = {
.long_name = NULL_IF_CONFIG_SMALL("Matroska / WebM"), .long_name = NULL_IF_CONFIG_SMALL("Matroska / WebM"),
.extensions = "mkv,mk3d,mka,mks,webm", .extensions = "mkv,mk3d,mka,mks,webm",
.priv_data_size = sizeof(MatroskaDemuxContext), .priv_data_size = sizeof(MatroskaDemuxContext),
.flags_internal = FF_FMT_INIT_CLEANUP,
.read_probe = matroska_probe, .read_probe = matroska_probe,
.read_header = matroska_read_header, .read_header = matroska_read_header,
.read_packet = matroska_read_packet, .read_packet = matroska_read_packet,
@ -4320,6 +4310,7 @@ const AVInputFormat ff_webm_dash_manifest_demuxer = {
.name = "webm_dash_manifest", .name = "webm_dash_manifest",
.long_name = NULL_IF_CONFIG_SMALL("WebM DASH Manifest"), .long_name = NULL_IF_CONFIG_SMALL("WebM DASH Manifest"),
.priv_data_size = sizeof(MatroskaDemuxContext), .priv_data_size = sizeof(MatroskaDemuxContext),
.flags_internal = FF_FMT_INIT_CLEANUP,
.read_header = webm_dash_manifest_read_header, .read_header = webm_dash_manifest_read_header,
.read_packet = webm_dash_manifest_read_packet, .read_packet = webm_dash_manifest_read_packet,
.read_close = matroska_read_close, .read_close = matroska_read_close,