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

AP_Logger: correct use of nullptr in SITL structure sanity checks 

A developer might be able to craft a fault such that s could be nullptr here.  They would need to work at it, but we can do better.
This commit is contained in:
Peter Barker 2023-08-14 11:48:01 +10:00 committed by Peter Barker
parent 0d97b308b2
commit 771f8855b7
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/AP_Logger/AP_Logger_Backend.cpp
View File

@ -381,6 +381,7 @@ void AP_Logger_Backend::validate_WritePrioritisedBlock(const void *pBuffer,
}
const uint8_t type = ((uint8_t*)pBuffer)[2];
uint8_t type_len;
const char *name_src;
const struct LogStructure *s = _front.structure_for_msg_type(type);
if (s == nullptr) {
const struct AP_Logger::log_write_fmt *t = _front.log_write_fmt_for_msg_type(type);
@ -388,13 +389,15 @@ void AP_Logger_Backend::validate_WritePrioritisedBlock(const void *pBuffer,
AP_HAL::panic("No structure for msg_type=%u", type);
}
type_len = t->msg_len;
name_src = t->name;
} else {
type_len = s->msg_len;
name_src = s->name;
}
if (type_len != size) {
char name[5] = {}; // get a null-terminated string
if (s->name != nullptr) {
memcpy(name, s->name, 4);
if (name_src != nullptr) {
memcpy(name, name_src, 4);
} else {
strncpy(name, "?NM?", ARRAY_SIZE(name));
}