hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Audio/MidiJack: Fix invalid read: (1) of #5408

Browse Source 
This fixes reading from jack MIDI events in case where
there are no jack MIDI events.
This commit is contained in:
Johannes Lorenz
2020-02-28 19:39:13 +01:00
committed by Johannes Lorenz
parent 317be01012
commit c6d60e982e
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/core/midi/MidiJack.cpp
View File

@@ -174,19 +174,22 @@ void MidiJack::JackMidiRead(jack_nframes_t nframes)
jack_nframes_t event_index = 0;
jack_nframes_t event_count = jack_midi_get_event_count(port_buf);
jack_midi_event_get(&in_event, port_buf, 0);
for(i=0; i<nframes; i++)
int rval = jack_midi_event_get(&in_event, port_buf, 0);
if (rval == 0 /* 0 = success */)
{
if((in_event.time == i) && (event_index < event_count))
for(i=0; i<nframes; i++)
{
// lmms is setup to parse bytes coming from a device
// parse it byte by byte as it expects
for(b=0;b<in_event.size;b++)
parseData( *(in_event.buffer + b) );
if((in_event.time == i) && (event_index < event_count))
{
// lmms is setup to parse bytes coming from a device
// parse it byte by byte as it expects
for(b=0;b<in_event.size;b++)
parseData( *(in_event.buffer + b) );
event_index++;
if(event_index < event_count)
jack_midi_event_get(&in_event, port_buf, event_index);
event_index++;
if(event_index < event_count)
jack_midi_event_get(&in_event, port_buf, event_index);
}
}
}
}