From 7146f825b279b6882b5372d7a5bec38d69848259 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 13 Dec 2016 08:34:05 +0100 Subject: [PATCH] decoder/ffmpeg: fix double free bug From the avformat_open_input() API documentation: "Note that a user-supplied AVFormatContext will be freed on failure." https://bugs.musicpd.org/view.php?id=4607 --- NEWS | 2 ++ src/decoder/plugins/FfmpegDecoderPlugin.cxx | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 564c99487..aa3eece70 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,6 @@ ver 0.19.20 (not yet released) +* decoder + - ffmpeg: fix crash bug ver 0.19.20 (2016/12/09) * protocol diff --git a/src/decoder/plugins/FfmpegDecoderPlugin.cxx b/src/decoder/plugins/FfmpegDecoderPlugin.cxx index fc287328a..915ad3e41 100644 --- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx +++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx @@ -71,7 +71,6 @@ FfmpegOpenInput(AVIOContext *pb, int err = avformat_open_input(&context, filename, fmt, nullptr); if (err < 0) { - avformat_free_context(context); SetFfmpegError(error, err, "avformat_open_input() failed"); return nullptr; }