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

8
src/include/86box/midi.h
View File

@@ -10,7 +10,7 @@ extern uint8_t MIDI_evt_len[256];
extern int midi_device_current;
extern int midi_input_device_current;
extern void (*input_msg)(void *p, uint8_t *msg);
extern void (*input_msg)(void *p, uint8_t *msg, uint32_t len);
extern int (*input_sysex)(void *p, uint8_t *buf, uint32_t len, int abort);
extern void *midi_in_p;
@@ -44,7 +44,7 @@ typedef struct midi_in_handler_t
int cnt;
uint32_t len;
void (*msg)(void *p, uint8_t *msg);
void (*msg)(void *p, uint8_t *msg, uint32_t len);
int (*sysex)(void *p, uint8_t *buffer, uint32_t len, int abort);
struct midi_in_handler_t *p;
struct midi_in_handler_t *prev, *next;
@@ -73,9 +73,9 @@ extern void midi_raw_out_byte(uint8_t val);
extern void midi_clear_buffer(void);
extern void midi_poll();
extern 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);
extern void 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);
extern void midi_in_handlers_clear(void);
extern void midi_in_msg(uint8_t *msg);
extern void midi_in_msg(uint8_t *msg, uint32_t len);
extern void midi_in_sysex(uint8_t *buffer, uint32_t len);
#if 0

2
src/include/86box/snd_mpu401.h
View File

@@ -159,4 +159,4 @@ extern void mpu401_device_add(void);
extern void mpu401_irq_attach(mpu_t *mpu, void (*ext_irq_update)(void *priv, int set), int (*ext_irq_pending)(void *priv), void *priv);
extern int MPU401_InputSysex(void *p, uint8_t *buffer, uint32_t len, int abort);
extern void MPU401_InputMsg(void *p, uint8_t *msg);
extern void MPU401_InputMsg(void *p, uint8_t *msg, uint32_t len);

2
src/include/86box/snd_sb_dsp.h
View File

@@ -102,7 +102,7 @@ typedef struct sb_dsp_t
} sb_dsp_t;
void sb_dsp_input_msg(void *p, uint8_t *msg);
void sb_dsp_input_msg(void *p, uint8_t *msg, uint32_t len);
int sb_dsp_input_sysex(void *p, uint8_t *buffer, uint32_t len, int abort);