From 197e72acc0efa094c48070b6409d605b00b36ba6 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 26 Apr 2016 18:20:35 +1000 Subject: [PATCH] GCS_MAVLink: fixed null termination bug found with ASAN --- libraries/GCS_MAVLink/GCS_Common.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/GCS_MAVLink/GCS_Common.cpp b/libraries/GCS_MAVLink/GCS_Common.cpp index c387547fbb..6fec6dbfc2 100644 --- a/libraries/GCS_MAVLink/GCS_Common.cpp +++ b/libraries/GCS_MAVLink/GCS_Common.cpp @@ -1121,11 +1121,12 @@ void GCS_MAVLINK::send_ahrs(AP_AHRS &ahrs) */ void GCS_MAVLINK::send_statustext_all(MAV_SEVERITY severity, const char *fmt, ...) { - char text[MAVLINK_MSG_STATUSTEXT_FIELD_TEXT_LEN] {}; + char text[MAVLINK_MSG_STATUSTEXT_FIELD_TEXT_LEN+1] {}; va_list arg_list; va_start(arg_list, fmt); - hal.util->vsnprintf((char *)text, sizeof(text), fmt, arg_list); + hal.util->vsnprintf((char *)text, sizeof(text)-1, fmt, arg_list); va_end(arg_list); + text[MAVLINK_MSG_STATUSTEXT_FIELD_TEXT_LEN] = 0; send_statustext(severity, mavlink_active, text); }