diff options
| author | Robin Gareus <robin@gareus.org> | 2014-12-31 03:12:57 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2014-12-31 03:19:00 +0100 |
| commit | f499f4cfd2e98ee67d8267aea76a71bf8f47af68 (patch) | |
| tree | 8a88f37280ffe7079c98e58c62e63fa205e36737 /libs/backends/alsa | |
| parent | 2c8babf41ea3809720fe99d074a4f74ad84b8271 (diff) | |
don't take temporary copy of MIDI sequence
fixes potential boost shared_ptr double free.
Diffstat (limited to 'libs/backends/alsa')
| -rw-r--r-- | libs/backends/alsa/alsa_audiobackend.cc | 8 | ||||
| -rw-r--r-- | libs/backends/alsa/alsa_audiobackend.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libs/backends/alsa/alsa_audiobackend.cc b/libs/backends/alsa/alsa_audiobackend.cc index 3ccc97ec94..8bf8efe61d 100644 --- a/libs/backends/alsa/alsa_audiobackend.cc +++ b/libs/backends/alsa/alsa_audiobackend.cc @@ -1467,10 +1467,10 @@ AlsaAudioBackend::main_process_thread () i = 0; for (std::vector<AlsaPort*>::const_iterator it = _system_midi_out.begin (); it != _system_midi_out.end (); ++it, ++i) { assert (_rmidi_out.size() > i); - const AlsaMidiBuffer src = static_cast<const AlsaMidiPort*>(*it)->const_buffer(); + const AlsaMidiBuffer * src = static_cast<const AlsaMidiPort*>(*it)->const_buffer(); AlsaMidiOut *rm = _rmidi_out.at(i); rm->sync_time (clock1); - for (AlsaMidiBuffer::const_iterator mit = src.begin (); mit != src.end (); ++mit) { + for (AlsaMidiBuffer::const_iterator mit = src->begin (); mit != src->end (); ++mit) { rm->send_event ((*mit)->timestamp(), (*mit)->data(), (*mit)->size()); } } @@ -1826,8 +1826,8 @@ void* AlsaMidiPort::get_buffer (pframes_t /* nframes */) for (std::vector<AlsaPort*>::const_iterator i = get_connections ().begin (); i != get_connections ().end (); ++i) { - const AlsaMidiBuffer src = static_cast<const AlsaMidiPort*>(*i)->const_buffer (); - for (AlsaMidiBuffer::const_iterator it = src.begin (); it != src.end (); ++it) { + const AlsaMidiBuffer * src = static_cast<const AlsaMidiPort*>(*i)->const_buffer (); + for (AlsaMidiBuffer::const_iterator it = src->begin (); it != src->end (); ++it) { (_buffer[_bufperiod]).push_back (boost::shared_ptr<AlsaMidiEvent>(new AlsaMidiEvent (**it))); } } diff --git a/libs/backends/alsa/alsa_audiobackend.h b/libs/backends/alsa/alsa_audiobackend.h index f9123875e6..3daae85b21 100644 --- a/libs/backends/alsa/alsa_audiobackend.h +++ b/libs/backends/alsa/alsa_audiobackend.h @@ -142,7 +142,7 @@ class AlsaMidiPort : public AlsaPort { DataType type () const { return DataType::MIDI; }; void* get_buffer (pframes_t nframes); - const AlsaMidiBuffer const_buffer () const { return _buffer[_bufperiod]; } + const AlsaMidiBuffer * const_buffer () const { return & _buffer[_bufperiod]; } void next_period() { if (_n_periods > 1) { get_buffer(0); _bufperiod = (_bufperiod + 1) % _n_periods; } } void set_n_periods(int n) { if (n > 0 && n < 3) { _n_periods = n; } } |