oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

mixer/software: fix double free bug

Browse Source
This commit is contained in:
Max Kellermann 2013-10-30 22:47:24 +01:00
parent da8bdd62c8
commit 88e630170e
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/mixer/SoftwareMixerPlugin.cxx
View File

@ -41,18 +41,28 @@ CreateVolumeFilter()
struct SoftwareMixer final : public Mixer { struct SoftwareMixer final : public Mixer {
Filter *filter; Filter *filter;
/**
* If this is true, then this object "owns" the #Filter
* instance (see above). It will be set to false by
* software_mixer_get_filter(); after that, the caller will be
* responsible for the #Filter.
*/
bool owns_filter;
unsigned volume; unsigned volume;
SoftwareMixer() SoftwareMixer()
:Mixer(software_mixer_plugin), :Mixer(software_mixer_plugin),
filter(CreateVolumeFilter()), filter(CreateVolumeFilter()),
volume(100) owns_filter(true),
volume(100)
{ {
assert(filter != nullptr); assert(filter != nullptr);
} }
~SoftwareMixer() { ~SoftwareMixer() {
delete filter; if (owns_filter)
delete filter;
} }
}; };
@ -115,6 +125,8 @@ software_mixer_get_filter(Mixer *mixer)
{ {
SoftwareMixer *sm = (SoftwareMixer *)mixer; SoftwareMixer *sm = (SoftwareMixer *)mixer;
assert(sm->IsPlugin(software_mixer_plugin)); assert(sm->IsPlugin(software_mixer_plugin));
assert(sm->owns_filter);
sm->owns_filter = false;
return sm->filter; return sm->filter;
} }