X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fbuffer_set.cc;h=34425324a56dcd698cabe6e1a472c47dfad0a4f3;hb=d17f58e5314ad826fc2473c587341facc285399d;hp=cd0a9c50581115bce036d56fc8fce47bca088730;hpb=eb998b32640e83828ff3c81eabf86fe0f319bbcd;p=ardour.git

diff --git a/libs/ardour/buffer_set.cc b/libs/ardour/buffer_set.cc
index cd0a9c5058..34425324a5 100644
--- a/libs/ardour/buffer_set.cc
+++ b/libs/ardour/buffer_set.cc
@@ -39,7 +39,7 @@
 #include "ardour/lv2_plugin.h"
 #include "lv2_evbuf.h"
 #endif
-#if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT
+#if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT || defined MACVST_SUPPORT
 #include "ardour/vestige/aeffectx.h"
 #endif
 
@@ -79,7 +79,7 @@ BufferSet::clear()
 	_count.reset();
 	_available.reset();
 
-#if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT 
+#if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT || defined MACVST_SUPPORT
 	for (VSTBuffers::iterator i = _vst_buffers.begin(); i != _vst_buffers.end(); ++i) {
 		delete *i;
 	}
@@ -89,7 +89,7 @@ BufferSet::clear()
 
 #ifdef LV2_SUPPORT
 	for (LV2Buffers::iterator i = _lv2_buffers.begin(); i != _lv2_buffers.end(); ++i) {
-		delete (*i).second;
+		free ((*i).second);
 	}
 	_lv2_buffers.clear ();
 #endif
@@ -187,7 +187,7 @@ BufferSet::ensure_buffers(DataType type, size_t num_buffers, size_t buffer_capac
 		for (size_t i = 0; i < num_buffers; ++i) {
 			bufs.push_back(Buffer::create(type, buffer_capacity));
 		}
-		
+
 		_available.set(type, num_buffers);
 		_count.set (type, num_buffers);
 	}
@@ -206,7 +206,7 @@ BufferSet::ensure_buffers(DataType type, size_t num_buffers, size_t buffer_capac
 	}
 #endif
 
-#if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT
+#if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT || defined MACVST_SUPPORT
 	// As above but for VST
 	if (type == DataType::MIDI) {
 		while (_vst_buffers.size() < _buffers[type].size()) {
@@ -343,12 +343,13 @@ BufferSet::flush_lv2_midi(bool input, size_t i)
 
 #endif /* LV2_SUPPORT */
 
-#if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT
+#if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT || defined MACVST_SUPPORT
 
 VstEvents*
 BufferSet::get_vst_midi (size_t b)
 {
 	MidiBuffer& m = get_midi (b);
+	assert (b <= _vst_buffers.size());
 	VSTBuffer* vst = _vst_buffers[b];
 
 	vst->clear ();
@@ -361,14 +362,25 @@ BufferSet::get_vst_midi (size_t b)
 }
 
 BufferSet::VSTBuffer::VSTBuffer (size_t c)
-  : _capacity (c)
+	: _events (0)
+	, _midi_events (0)
+	, _capacity (c)
 {
-	_events = static_cast<VstEvents*> (malloc (sizeof (VstEvents) + _capacity * sizeof (VstEvent *)));
-	_midi_events = static_cast<VstMidiEvent*> (malloc (sizeof (VstMidiEvent) * _capacity));
+	if (_capacity > 0) {
+		/* from `man malloc`: "If size is 0, then malloc() returns either NULL, or a
+		 * unique pointer value that can later be successfully passed to free()."
+		 *
+		 * The latter will cause trouble here.
+		 */
+		_events = static_cast<VstEvents*> (malloc (sizeof (VstEvents) + _capacity * sizeof (VstEvent *)));
+		_midi_events = static_cast<VstMidiEvent*> (malloc (sizeof (VstMidiEvent) * _capacity));
+	}
 
 	if (_events == 0 || _midi_events == 0) {
 		free (_events);
 		free (_midi_events);
+		_events = 0;
+		_midi_events = 0;
 		throw failed_constructor ();
 	}
 
@@ -389,7 +401,7 @@ BufferSet::VSTBuffer::clear ()
 }
 
 void
-BufferSet::VSTBuffer::push_back (Evoral::MIDIEvent<framepos_t> const & ev)
+BufferSet::VSTBuffer::push_back (Evoral::Event<framepos_t> const & ev)
 {
 	if (ev.size() > 3) {
 		/* XXX: this will silently drop MIDI messages longer than 3 bytes, so
@@ -399,6 +411,9 @@ BufferSet::VSTBuffer::push_back (Evoral::MIDIEvent<framepos_t> const & ev)
 	}
 	int const n = _events->numEvents;
 	assert (n < (int) _capacity);
+	if (n >= _capacity) {
+		return;
+	}
 
 	_events->events[n] = reinterpret_cast<VstEvent*> (_midi_events + n);
 	VstMidiEvent* v = reinterpret_cast<VstMidiEvent*> (_events->events[n]);