back-port two actual bug fixes from cairocanvas branch

diff --git a/libs/ardour/vst_plugin.cc b/libs/ardour/vst_plugin.cc
index b80a594495d8c936125d3fff58853aeb1f77a35c..00cd6efaa5fdd37c79e18b05c395c11ba9051c61 100644 (file)
--- 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 6da6036ea0e9c92a32a83f481acc58990e84ddf0..f27d092a8b52d1e038ee46b468eb0202860e46b0 100644 (file)
--- 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);