claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for midi input

Browse Source 
- Fix buffer overflow in midi input messages
- Detect sysex messages by starting byte instead of length
This commit is contained in:
ts-korhonen
2022-01-07 08:18:15 +02:00
committed by David Hrdlička
parent 2da187c0bd
commit e9332cf670
8 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/sound/midi.c
View File

@@ -396,7 +396,7 @@ midi_clear_buffer(void)
void
midi_in_handler(int set, void (*msg)(void *p, uint8_t *msg), int (*sysex)(void *p, uint8_t *buffer, uint32_t len, int abort), void *p)
midi_in_handler(int set, void (*msg)(void *p, uint8_t *msg, uint32_t len), int (*sysex)(void *p, uint8_t *buffer, uint32_t len, int abort), void *p)
{
midi_in_handler_t *temp = NULL, *next;
@@ -479,7 +479,7 @@ midi_in_handlers_clear(void)
void
midi_in_msg(uint8_t *msg)
midi_in_msg(uint8_t *msg, uint32_t len)
{
midi_in_handler_t *temp = mih_first;
@@ -488,7 +488,7 @@ midi_in_msg(uint8_t *msg)
break;
if (temp->msg)
temp->msg(temp->p, msg);
temp->msg(temp->p, msg, len);
temp = temp->next;

6
src/sound/midi_rtmidi.cpp
View File

@@ -145,10 +145,10 @@ rtmidi_get_dev_name(int num, char *s)
void
rtmidi_input_callback(double timeStamp, std::vector<unsigned char> *message, void *userData)
{
if (message->size() <= 3)
midi_in_msg(message->data());
if (message->front() == 0xF0)
midi_in_sysex(message->data(), message->size());
else
midi_in_sysex(message->data(), message->size());
midi_in_msg(message->data(), message->size());
}

4
src/sound/snd_gus.c
View File

@@ -1125,7 +1125,7 @@ static void gus_get_buffer(int32_t *buffer, int len, void *p)
gus->pos = 0;
}
static void gus_input_msg(void *p, uint8_t *msg)
static void gus_input_msg(void *p, uint8_t *msg, uint32_t len)
{
gus_t *gus = (gus_t *)p;
uint8_t i;
@@ -1136,7 +1136,7 @@ static void gus_input_msg(void *p, uint8_t *msg)
if (gus->uart_in) {
gus->midi_status |= MIDI_INT_RECEIVE;
for (i=0;i<msg[3];i++) {
for (i=0; i < len; i++) {
gus->midi_queue[gus->midi_w++] = msg[i];
gus->midi_w &= 63;
}

4
src/sound/snd_mpu401.c
View File

@@ -1422,12 +1422,12 @@ MPU401_InputSysex(void *p, uint8_t *buffer, uint32_t len, int abort)
/*Input handler for MIDI*/
void
MPU401_InputMsg(void *p, uint8_t *msg)
MPU401_InputMsg(void *p, uint8_t *msg, uint32_t len)
{
mpu_t *mpu = (mpu_t *)p;
int i, tick;
static uint8_t old_msg = 0;
uint8_t len = msg[3], key;
uint8_t key;
uint8_t recdata[2], recmsg[4];
int send = 1, send_thru = 0;
int retrigger_thru = 0, chan, chrefnum;

8
src/sound/snd_sb_dsp.c
View File

@@ -1036,15 +1036,15 @@ sb_read(uint16_t a, void *priv)
void
sb_dsp_input_msg(void *p, uint8_t *msg)
sb_dsp_input_msg(void *p, uint8_t *msg, uint32_t len)
{
sb_dsp_t *dsp = (sb_dsp_t *) p;
uint8_t len = msg[3], i = 0;
uint8_t i = 0;
sb_dsp_log("MIDI in sysex = %d, uart irq = %d, msg = %d\n", dsp->midi_in_sysex, dsp->uart_irq, msg[3]);
sb_dsp_log("MIDI in sysex = %d, uart irq = %d, msg = %d\n", dsp->midi_in_sysex, dsp->uart_irq, len);
if (!dsp->uart_irq && !dsp->midi_in_poll && (dsp->mpu != NULL)) {
MPU401_InputMsg(dsp->mpu, msg);
MPU401_InputMsg(dsp->mpu, msg, len);
return;
}