mirror of
https://github.com/ArduPilot/ardupilot
synced 2025-01-03 06:28:27 -04:00
AP_NavEKF2: handle core setup failure
ensure num_cores is left as zero so that calls such as Log_Write don't de-reference nullptr
This commit is contained in:
parent
27d96eb64e
commit
5a5c9d10a9
@ -662,6 +662,7 @@ bool NavEKF2::InitialiseFilter(void)
|
||||
if (AP::dal().available_memory() < sizeof(NavEKF2_core)*num_cores + 4096) {
|
||||
initFailure = InitFailures::NO_MEM;
|
||||
core_malloc_failed = true;
|
||||
num_cores = 0;
|
||||
GCS_SEND_TEXT(MAV_SEVERITY_CRITICAL, "NavEKF2: not enough memory available");
|
||||
return false;
|
||||
}
|
||||
@ -671,6 +672,7 @@ bool NavEKF2::InitialiseFilter(void)
|
||||
if (core == nullptr) {
|
||||
initFailure = InitFailures::NO_MEM;
|
||||
core_malloc_failed = true;
|
||||
num_cores = 0;
|
||||
GCS_SEND_TEXT(MAV_SEVERITY_CRITICAL, "NavEKF2: memory allocation failed");
|
||||
return false;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user