Skip to content

M
mpd
Commit acd3f8cd authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

decoder/ffmpeg: free AVFormatContext on error

Fix a memory leak in some code paths.
parent ca1fc131
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
src/decoder/ffmpeg_decoder_plugin.c
View file @ acd3f8cd
...@@ -193,12 +193,14 @@ ffmpeg_helper(struct input_stream *input, ...@@ -193,12 +193,14 @@ ffmpeg_helper(struct input_stream *input,
if (av_find_stream_info(format_context)<0) { if (av_find_stream_info(format_context)<0) {
g_warning("Couldn't find stream info\n"); g_warning("Couldn't find stream info\n");
av_close_input_file(format_context);
return false; return false;
} }
audio_stream = ffmpeg_find_audio_stream(format_context); audio_stream = ffmpeg_find_audio_stream(format_context);
if (audio_stream == -1) { if (audio_stream == -1) {
g_warning("No audio stream inside\n"); g_warning("No audio stream inside\n");
av_close_input_file(format_context);
return false; return false;
} }
...@@ -210,11 +212,13 @@ ffmpeg_helper(struct input_stream *input, ...@@ -210,11 +212,13 @@ ffmpeg_helper(struct input_stream *input,
if (!codec) { if (!codec) {
g_warning("Unsupported audio codec\n"); g_warning("Unsupported audio codec\n");
av_close_input_file(format_context);
return false; return false;
} }
if (avcodec_open(codec_context, codec)<0) { if (avcodec_open(codec_context, codec)<0) {
g_warning("Could not open codec\n"); g_warning("Could not open codec\n");
av_close_input_file(format_context);
return false; return false;
} }
......
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