diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-11-05 10:17:40 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-11-05 10:17:40 -0500 |
| commit | 0f33baf32fd6842398a17e62e7c18248602269f7 (patch) | |
| tree | 53f2d7506ad816c1c1a42e1c1b991d4fd31f001f | |
| parent | 7aa46da32f880ad4c7ced29fcea27e002a2c2321 (diff) | |
back-port two actual bug fixes from cairocanvas branch
| -rw-r--r-- | libs/ardour/vst_plugin.cc | 2 | ||||
| -rw-r--r-- | libs/evoral/src/libsmf/smf_load.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/vst_plugin.cc b/libs/ardour/vst_plugin.cc index b80a594495..00cd6efaa5 100644 --- a/libs/ardour/vst_plugin.cc +++ b/libs/ardour/vst_plugin.cc @@ -298,7 +298,7 @@ VSTPlugin::get_parameter_descriptor (uint32_t which, ParameterDescriptor& desc) char label[64]; /* some VST plugins expect this buffer to be zero-filled */ - memset (label, sizeof (label), 0); + memset (label, 0, sizeof (label)); _plugin->dispatcher (_plugin, effGetParamName, which, 0, label, 0); diff --git a/libs/evoral/src/libsmf/smf_load.c b/libs/evoral/src/libsmf/smf_load.c index 6da6036ea0..f27d092a8b 100644 --- a/libs/evoral/src/libsmf/smf_load.c +++ b/libs/evoral/src/libsmf/smf_load.c @@ -633,7 +633,7 @@ smf_event_is_textual(const smf_event_t *event) if (event->midi_buffer_length < 4) return (0); - if (event->midi_buffer[3] < 1 && event->midi_buffer[3] > 9) + if (event->midi_buffer[3] < 1 || event->midi_buffer[3] > 9) return (0); return (1); |