smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 07:45:00 +01:00
Code Issues Projects Releases Wiki Activity

adjust LV2 ringbuffer size according to LV2:resize-port

Browse source 
The message-size itself is part of the message which
stored in the ringbuffer. If the rinbuffer overflows
the message is misinterpreted -> segfault.

Choose a more conservative ring-buffer size and take
the requested LV2 size into account.
This commit is contained in:
Robin Gareus 2013-12-12 14:40:45 +01:00
parent 527b0a78a1
commit fd1eb73ef2
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
libs/ardour/lv2_plugin.cc
View file

@ -1162,10 +1162,14 @@ LV2Plugin::write_from_ui(uint32_t index,
* e.g 48kSPS / 128fpp -> audio-periods = 375 Hz * e.g 48kSPS / 128fpp -> audio-periods = 375 Hz
* ui-periods = 25 Hz (SuperRapidScreenUpdate) * ui-periods = 25 Hz (SuperRapidScreenUpdate)
* default minimumSize = 32K (see LV2Plugin::allocate_atom_event_buffers() * default minimumSize = 32K (see LV2Plugin::allocate_atom_event_buffers()
* -> 15 * 32K *
* it is safe to overflow (but the plugin state may be inconsistent). * it is NOT safe to overflow (msg.size will be misinterpreted)
*/ */
rbs = max((size_t) 32768 * 6, rbs); uint32_t bufsiz = 32768;
if (_atom_ev_buffers && _atom_ev_buffers[0]) {
bufsiz = lv2_evbuf_get_capacity(_atom_ev_buffers[0]);
}
rbs = max((size_t) bufsiz * 8, rbs);
_from_ui = new RingBuffer<uint8_t>(rbs); _from_ui = new RingBuffer<uint8_t>(rbs);
} }
@ -1194,8 +1198,12 @@ LV2Plugin::enable_ui_emmission()
{ {
if (!_to_ui) { if (!_to_ui) {
/* see note in LV2Plugin::write_from_ui() */ /* see note in LV2Plugin::write_from_ui() */
uint32_t bufsiz = 32768;
if (_atom_ev_buffers && _atom_ev_buffers[0]) {
bufsiz = lv2_evbuf_get_capacity(_atom_ev_buffers[0]);
}
size_t rbs = _session.engine().raw_buffer_size(DataType::MIDI) * NBUFS; size_t rbs = _session.engine().raw_buffer_size(DataType::MIDI) * NBUFS;
rbs = max((size_t) 32768 * 8, rbs); rbs = max((size_t) bufsiz * 8, rbs);
_to_ui = new RingBuffer<uint8_t>(rbs); _to_ui = new RingBuffer<uint8_t>(rbs);
} }
} }