Commit f8080bd1 authored by Anton Khirnov's avatar Anton Khirnov

xmv: do not leak memory in the error paths in xmv_read_header()

CC: libav-stable@libav.org
parent d1016dcc
...@@ -188,8 +188,10 @@ static int xmv_read_header(AVFormatContext *s) ...@@ -188,8 +188,10 @@ static int xmv_read_header(AVFormatContext *s)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
xmv->audio = av_malloc(xmv->audio_track_count * sizeof(XMVAudioPacket)); xmv->audio = av_malloc(xmv->audio_track_count * sizeof(XMVAudioPacket));
if (!xmv->audio) if (!xmv->audio) {
return AVERROR(ENOMEM); ret = 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++) {
XMVAudioTrack *track = &xmv->audio_tracks[audio_track]; XMVAudioTrack *track = &xmv->audio_tracks[audio_track];
...@@ -230,8 +232,10 @@ static int xmv_read_header(AVFormatContext *s) ...@@ -230,8 +232,10 @@ static int xmv_read_header(AVFormatContext *s)
} }
ast = avformat_new_stream(s, NULL); ast = avformat_new_stream(s, NULL);
if (!ast) if (!ast) {
return AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto fail;
}
ast->codec->codec_type = AVMEDIA_TYPE_AUDIO; ast->codec->codec_type = AVMEDIA_TYPE_AUDIO;
ast->codec->codec_id = track->codec_id; ast->codec->codec_id = track->codec_id;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment