diff options
| author | Robin Gareus <robin@gareus.org> | 2015-09-25 19:43:43 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2015-09-25 19:44:30 +0200 |
| commit | 26fdf99a92abfd3e84ae5fb768cb73f99563c156 (patch) | |
| tree | a582a32c87c67bee4634f6042fb02a87509f947c /libs | |
| parent | e935890fc54af99e05dffcb0e07718e6895df47d (diff) | |
copy LV2 options to heap.
Stack pointer becomes invalid when the array goes out of scope.
Fixes rare crash in suil_wrapper_new() or GUIs iterating over options.
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/lv2_plugin.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libs/ardour/lv2_plugin.cc b/libs/ardour/lv2_plugin.cc index 877a6577cc..cd1c190c38 100644 --- a/libs/ardour/lv2_plugin.cc +++ b/libs/ardour/lv2_plugin.cc @@ -242,6 +242,7 @@ struct LV2Plugin::Impl { , opts_iface(0) , state(0) , block_length(0) + , options(0) {} /** Find the LV2 input port with the given designation. @@ -261,6 +262,7 @@ struct LV2Plugin::Impl { LV2_Atom_Forge forge; LV2_Atom_Forge ui_forge; int32_t block_length; + LV2_Options_Option* options; }; LV2Plugin::LV2Plugin (AudioEngine& engine, @@ -385,8 +387,11 @@ LV2Plugin::init(const void* c_plugin, framecnt_t rate) { LV2_OPTIONS_INSTANCE, 0, 0, 0, 0, NULL } }; + _impl->options = (LV2_Options_Option*) malloc (sizeof (options)); + memcpy ((void*) _impl->options, (void*) options, sizeof (options)); + _options_feature.URI = LV2_OPTIONS__options; - _options_feature.data = options; + _options_feature.data = _impl->options; _features[n_features++] = &_options_feature; #endif @@ -679,6 +684,7 @@ LV2Plugin::~LV2Plugin () lilv_instance_free(_impl->instance); lilv_node_free(_impl->name); lilv_node_free(_impl->author); + free(_impl->options); free(_features); free(_make_path_feature.data); |