Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-22 07:44:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Logger: fix extremely unlikely nullptr dereference in SITL sanity checks

Browse Source
This commit is contained in:
Peter Barker 2020-03-28 12:03:13 +11:00 committed by Peter Barker
parent 75b133926f
commit aeb45bf146
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/AP_Logger/AP_Logger_Backend.cpp
View File

@ -349,7 +349,11 @@ void AP_Logger_Backend::validate_WritePrioritisedBlock(const void *pBuffer,
}
if (type_len != size) {
char name[5] = {}; // get a null-terminated string
memcpy(name, s->name, 4);
if (s->name != nullptr) {
memcpy(name, s->name, 4);
} else {
strncpy(name, "?NM?", ARRAY_SIZE(name));
}
AP_HAL::panic("Size mismatch for %u (%s) (expected=%u got=%u)\n",
type, name, type_len, size);
}