andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #3042 from rppicomidi/fix_3033

Browse Source 
Fix #3033: Increase array bounds and test for overflow
This commit is contained in:
Ha Thach
2025-03-21 22:56:16 +07:00
committed by GitHub
parent c2924c51fc 3324a327cb
commit cf76af1056
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/class/midi/midi_host.c
View File

@@ -254,7 +254,9 @@ bool midih_open(uint8_t rhport, uint8_t dev_addr, tusb_desc_interface_t const *d
TU_LOG_DRV(" Jack %s %s descriptor \r\n", TU_LOG_DRV(" Jack %s %s descriptor \r\n",
tu_desc_subtype(p_desc) == MIDI_CS_INTERFACE_IN_JACK ? "IN" : "OUT", tu_desc_subtype(p_desc) == MIDI_CS_INTERFACE_IN_JACK ? "IN" : "OUT",
p_desc[3] == MIDI_JACK_EXTERNAL ? "External" : "Embedded"); p_desc[3] == MIDI_JACK_EXTERNAL ? "External" : "Embedded");
desc_cb.desc_jack[desc_cb.jack_num++] = p_desc; if (desc_cb.jack_num < TU_ARRAY_SIZE(desc_cb.desc_jack)) {
desc_cb.desc_jack[desc_cb.jack_num++] = p_desc;
}
break; break;
} }
@@ -590,8 +592,8 @@ uint32_t tuh_midi_stream_read(uint8_t idx, uint8_t *p_cable_num, uint8_t *p_buff
break; break;
default: default:
break; break;
cable_sysex_in_progress &= (uint16_t) ~cable_mask;
} }
cable_sysex_in_progress &= (uint16_t) ~cable_mask;
} else { } else {
// Real-time message: can be inserted into a sysex message, // Real-time message: can be inserted into a sysex message,
// so do don't clear cable_sysex_in_progress bit // so do don't clear cable_sysex_in_progress bit

2
src/class/midi/midi_host.h
View File

@@ -69,7 +69,7 @@ typedef struct {
const tusb_desc_endpoint_t* desc_epout; // endpoint OUT descriptor, CS_ENDPOINT is right after const tusb_desc_endpoint_t* desc_epout; // endpoint OUT descriptor, CS_ENDPOINT is right after
uint8_t jack_num; uint8_t jack_num;
const uint8_t* desc_jack[16]; // list of jack descriptors (embedded + external) const uint8_t* desc_jack[32]; // list of jack descriptors (embedded + external)
} tuh_midi_descriptor_cb_t; } tuh_midi_descriptor_cb_t;
typedef struct { typedef struct {