Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_Beacon: MarvelMind: avoid potentially reading INT32_MAX bytes of input 

constrain the number of bytes read.  Simplify the way bytes are read.

the return value from available() is unsigned...
This commit is contained in:
Peter Barker 2023-07-14 09:56:39 +10:00 committed by Andrew Tridgell
parent 32659fd3b6
commit 92b7cfbbb2
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/AP_Beacon/AP_Beacon_Marvelmind.cpp
View File

@ -203,15 +203,13 @@ void AP_Beacon_Marvelmind::update(void)
return;
}
// read any available characters
int32_t num_bytes_read = uart->available();
uint8_t received_char = 0;
if (num_bytes_read < 0) {
return;
}
uint16_t num_bytes_read = MIN(uart->available(), 16384U);
while (num_bytes_read-- > 0) {
bool good_byte = false;
received_char = uart->read();
input_buffer[num_bytes_in_block_received] = received_char;
if (!uart->read(input_buffer[num_bytes_in_block_received])) {
break;
}
const uint8_t received_char = input_buffer[num_bytes_in_block_received];
switch (parse_state) {
case RECV_HDR:
switch (num_bytes_in_block_received) {