Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-26 01:33:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

GCS_MAVLink: avoid integer underflow in mavlink txspace check

Browse Source
This commit is contained in:
Andrew Tridgell 2014-07-27 21:15:25 +10:00
parent f7b01a6f3f
commit 2ebdfce4ea
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/GCS_MAVLink/GCS_Logs.cpp
View File

@ -162,8 +162,8 @@ void GCS_MAVLINK::handle_log_send(DataFlash_Class &dataflash)
*/
void GCS_MAVLINK::handle_log_send_listing(DataFlash_Class &dataflash)
{
int16_t payload_space = comm_get_txspace(chan) - MAVLINK_NUM_NON_PAYLOAD_BYTES;
if (payload_space < MAVLINK_MSG_ID_LOG_ENTRY_LEN) {
uint16_t txspace = comm_get_txspace(chan);
if (txspace < MAVLINK_NUM_NON_PAYLOAD_BYTES+MAVLINK_MSG_ID_LOG_ENTRY_LEN) {
// no space
return;
}
@ -192,8 +192,8 @@ void GCS_MAVLINK::handle_log_send_listing(DataFlash_Class &dataflash)
*/
bool GCS_MAVLINK::handle_log_send_data(DataFlash_Class &dataflash)
{
int16_t payload_space = comm_get_txspace(chan) - MAVLINK_NUM_NON_PAYLOAD_BYTES;
if (payload_space < MAVLINK_MSG_ID_LOG_DATA_LEN) {
uint16_t txspace = comm_get_txspace(chan);
if (txspace < MAVLINK_NUM_NON_PAYLOAD_BYTES+MAVLINK_MSG_ID_LOG_DATA_LEN) {
// no space
return false;
}

2
libraries/GCS_MAVLink/GCS_serial_control.cpp
View File

@ -87,7 +87,7 @@ void GCS_MAVLINK::handle_serial_control(mavlink_message_t *msg, AP_GPS &gps)
while (port->txspace() <= 0) {
hal.scheduler->delay(5);
}
uint8_t n = port->txspace();
uint16_t n = port->txspace();
if (n > packet.count) {
n = packet.count;
}