aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Copter: avoid integer underflow in mavlink txspace check

Browse Source
This commit is contained in:
Andrew Tridgell 2014-07-27 21:14:39 +10:00
parent 7810314f7c
commit b36e4b4122
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ArduCopter/GCS_Mavlink.pde
View File

@ -14,7 +14,7 @@ static bool gcs_out_of_time;
// check if a message will fit in the payload space available // check if a message will fit in the payload space available
#define CHECK_PAYLOAD_SIZE(id) if (payload_space < MAVLINK_MSG_ID_ ## id ## _LEN) return false #define CHECK_PAYLOAD_SIZE(id) if (txspace < MAVLINK_NUM_NON_PAYLOAD_BYTES+MAVLINK_MSG_ID_ ## id ## _LEN) return false
// prototype this for use inside the GCS class // prototype this for use inside the GCS class
static void gcs_send_text_fmt(const prog_char_t *fmt, ...); static void gcs_send_text_fmt(const prog_char_t *fmt, ...);
@ -458,7 +458,7 @@ static bool telemetry_delayed(mavlink_channel_t chan)
// try to send a message, return false if it won't fit in the serial tx buffer // try to send a message, return false if it won't fit in the serial tx buffer
bool GCS_MAVLINK::try_send_message(enum ap_message id) bool GCS_MAVLINK::try_send_message(enum ap_message id)
{ {
int16_t payload_space = comm_get_txspace(chan) - MAVLINK_NUM_NON_PAYLOAD_BYTES; uint16_t txspace = comm_get_txspace(chan);
if (telemetry_delayed(chan)) { if (telemetry_delayed(chan)) {
return false; return false;