Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

avformat/xmv: 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 f545155eb3
commit 3da2f4502a
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
libavformat/xmv.c
View file

@ -149,7 +149,6 @@ static int xmv_read_header(AVFormatContext *s)
uint32_t file_version; uint32_t file_version;
uint32_t this_packet_size; uint32_t this_packet_size;
uint16_t audio_track; uint16_t audio_track;
int ret;
s->ctx_flags |= AVFMTCTX_NOHEADER; s->ctx_flags |= AVFMTCTX_NOHEADER;
@ -177,10 +176,8 @@ static int xmv_read_header(AVFormatContext *s)
avio_skip(pb, 2); /* Unknown (padding?) */ avio_skip(pb, 2); /* Unknown (padding?) */
xmv->audio = av_mallocz_array(xmv->audio_track_count, sizeof(XMVAudioPacket)); xmv->audio = av_mallocz_array(xmv->audio_track_count, sizeof(XMVAudioPacket));
if (!xmv->audio) { if (!xmv->audio)
ret = AVERROR(ENOMEM); return AVERROR(ENOMEM);
goto fail;
}
for (audio_track = 0; audio_track < xmv->audio_track_count; audio_track++) { for (audio_track = 0; audio_track < xmv->audio_track_count; audio_track++) {
XMVAudioPacket *packet = &xmv->audio[audio_track]; XMVAudioPacket *packet = &xmv->audio[audio_track];
@ -214,8 +211,7 @@ static int xmv_read_header(AVFormatContext *s)
packet->channels >= UINT16_MAX / XMV_BLOCK_ALIGN_SIZE) { packet->channels >= UINT16_MAX / XMV_BLOCK_ALIGN_SIZE) {
av_log(s, AV_LOG_ERROR, "Invalid parameters for audio track %"PRIu16".\n", av_log(s, AV_LOG_ERROR, "Invalid parameters for audio track %"PRIu16".\n",
audio_track); audio_track);
ret = AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
goto fail;
} }
} }
@ -227,10 +223,6 @@ static int xmv_read_header(AVFormatContext *s)
xmv->stream_count = xmv->audio_track_count + 1; xmv->stream_count = xmv->audio_track_count + 1;
return 0; return 0;
fail:
xmv_read_close(s);
return ret;
} }
static void xmv_read_extradata(uint8_t *extradata, AVIOContext *pb) static void xmv_read_extradata(uint8_t *extradata, AVIOContext *pb)
@ -588,6 +580,7 @@ const AVInputFormat ff_xmv_demuxer = {
.long_name = NULL_IF_CONFIG_SMALL("Microsoft XMV"), .long_name = NULL_IF_CONFIG_SMALL("Microsoft XMV"),
.extensions = "xmv", .extensions = "xmv",
.priv_data_size = sizeof(XMVDemuxContext), .priv_data_size = sizeof(XMVDemuxContext),
.flags_internal = FF_FMT_INIT_CLEANUP,
.read_probe = xmv_probe, .read_probe = xmv_probe,
.read_header = xmv_read_header, .read_header = xmv_read_header,
.read_packet = xmv_read_packet, .read_packet = xmv_read_packet,