ardour/livetrax
13
0
Fork 0
Code

Fix OSC observer heap buffer-overflow

Browse Source
This commit is contained in:
Matthew Smith 2024-10-23 14:54:00 +02:00 committed by Robin Gareus
parent 86a4447805
commit 84027120cc
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/surfaces/osc/osc_cue_observer.cc
View File

@ -94,7 +94,7 @@ OSCCueObserver::refresh_strip (std::shared_ptr<ARDOUR::Stripable> new_strip, Sor
_strip->mute_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, std::bind (&OSCCueObserver::send_change_message, this, X_("/cue/mute"), 0, std::weak_ptr<Controllable>(_strip->mute_control())), OSC::instance());
send_change_message (X_("/cue/mute"), 0, _strip->mute_control());
gain_timeout.push_back (0);
gain_timeout[0] = 0;
_last_gain[0] = -1; // unused
_strip->gain_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, std::bind (&OSCCueObserver::send_gain_message, this, 0, std::weak_ptr<Controllable>(_strip->gain_control()), false), OSC::instance());
send_gain_message (0, _strip->gain_control(), true);
@ -162,7 +162,7 @@ OSCCueObserver::send_init()
if (send->gain_control()) {
gain_timeout.push_back (0);
gain_timeout[i + 1] = 0;
_last_gain[i + 1] = -1.0;
send->gain_control()->Changed.connect (send_connections, MISSING_INVALIDATOR, std::bind (&OSCCueObserver::send_gain_message, this, i + 1, std::weak_ptr<Controllable>(send->gain_control()), false), OSC::instance());
send_gain_message (i + 1, send->gain_control(), true);
@ -246,10 +246,8 @@ OSCCueObserver::send_gain_message (uint32_t id, std::weak_ptr<Controllable> wea
return;
}
if (id) {
_osc.text_message_with_id (X_("/cue/send/name"), id, string_compose ("%1%2%3", std::fixed, std::setprecision(2), accurate_coefficient_to_dB (controllable->get_value())), true, addr);
_osc.float_message_with_id (X_("/cue/send/fader"), id, controllable->internal_to_interface (controllable->get_value()), true, addr);
} else {
_osc.text_message (X_("/cue/name"), string_compose ("%1%2%3", std::fixed, std::setprecision(2), accurate_coefficient_to_dB (controllable->get_value())), addr);
_osc.float_message (X_("/cue/fader"), controllable->internal_to_interface (controllable->get_value()), addr);
}

2
libs/surfaces/osc/osc_cue_observer.h
View File

@ -60,7 +60,7 @@ class OSCCueObserver
ArdourSurface::OSC::OSCSurface* sur;
float _last_meter;
float _last_signal;
std::vector<uint32_t> gain_timeout;
std::map<uint32_t,float> gain_timeout;
bool tick_enable;
std::map<uint32_t,float> _last_gain;