Skip to content

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

filter/chain: copy the child name

filter_chain_parse() passes a temporary string pointer which results in a use-after-free in the PreparedChainFilter::Child::Open() error message.
parent 27c589da
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
NEWS
View file @ b0002e3b
ver 0.22.3 (not yet released) ver 0.22.3 (not yet released)
* playlist * playlist
- add option "as_directory", making CUE file expansion optional - add option "as_directory", making CUE file expansion optional
* filter
- fix garbage after "Audio format not supported by filter" message
ver 0.22.2 (2020/10/28) ver 0.22.2 (2020/10/28)
* database * database
......
src/filter/plugins/ChainFilterPlugin.cxx
View file @ b0002e3b
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include <cassert> #include <cassert>
#include <list> #include <list>
#include <memory> #include <memory>
#include <string>
class ChainFilter final : public Filter { class ChainFilter final : public Filter {
struct Child { struct Child {
...@@ -72,7 +73,7 @@ private: ...@@ -72,7 +73,7 @@ private:
class PreparedChainFilter final : public PreparedFilter { class PreparedChainFilter final : public PreparedFilter {
struct Child { struct Child {
const char *name; const std::string name;
std::unique_ptr<PreparedFilter> filter; std::unique_ptr<PreparedFilter> filter;
Child(const char *_name, Child(const char *_name,
...@@ -105,7 +106,7 @@ PreparedChainFilter::Child::Open(const AudioFormat &prev_audio_format) ...@@ -105,7 +106,7 @@ PreparedChainFilter::Child::Open(const AudioFormat &prev_audio_format)
if (conv_audio_format != prev_audio_format) if (conv_audio_format != prev_audio_format)
throw FormatRuntimeError("Audio format not supported by filter '%s': %s", throw FormatRuntimeError("Audio format not supported by filter '%s': %s",
name, name.c_str(),
ToString(prev_audio_format).c_str()); ToString(prev_audio_format).c_str());
return new_filter; return new_filter;
......
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