Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-03-13 10:03:57 -03:00
Code Issues Packages Projects Releases Wiki Activity

AP_BoardConfig: correct va_list memory over-read error

Browse Source 
A va_list can only be used once - so take a copy each time we want to
use it
This commit is contained in:
Peter Barker 2021-11-22 15:38:27 +11:00 committed by Andrew Tridgell
parent 467caa5259
commit 6a13613a0f
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libraries/AP_BoardConfig/AP_BoardConfig.cpp
View File

@ -391,10 +391,20 @@ void AP_BoardConfig::throw_error(const char *err_type, const char *fmt, va_list
last_print_ms = now; last_print_ms = now;
char printfmt[MAVLINK_MSG_STATUSTEXT_FIELD_TEXT_LEN+2]; char printfmt[MAVLINK_MSG_STATUSTEXT_FIELD_TEXT_LEN+2];
hal.util->snprintf(printfmt, sizeof(printfmt), "%s: %s\n", err_type, fmt); hal.util->snprintf(printfmt, sizeof(printfmt), "%s: %s\n", err_type, fmt);
vprintf(printfmt, arg); {
va_list arg_copy;
va_copy(arg_copy, arg);
vprintf(printfmt, arg_copy);
va_end(arg_copy);
}
#if !APM_BUILD_TYPE(APM_BUILD_UNKNOWN) && !defined(HAL_BUILD_AP_PERIPH) #if !APM_BUILD_TYPE(APM_BUILD_UNKNOWN) && !defined(HAL_BUILD_AP_PERIPH)
hal.util->snprintf(printfmt, sizeof(printfmt), "%s: %s", err_type, fmt); hal.util->snprintf(printfmt, sizeof(printfmt), "%s: %s", err_type, fmt);
gcs().send_textv(MAV_SEVERITY_CRITICAL, printfmt, arg); {
va_list arg_copy;
va_copy(arg_copy, arg);
gcs().send_textv(MAV_SEVERITY_CRITICAL, printfmt, arg_copy);
va_end(arg_copy);
}
#endif #endif
} }
#if !APM_BUILD_TYPE(APM_BUILD_UNKNOWN) && !defined(HAL_BUILD_AP_PERIPH) #if !APM_BUILD_TYPE(APM_BUILD_UNKNOWN) && !defined(HAL_BUILD_AP_PERIPH)