fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-15 21:33:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

rtl: guard access of dynamically created _rtl_mission_type_handle behind if()

Browse Source 
To avoid hard faults from NULL access.

Signed-off-by: Silvan <silvan@auterion.com>
This commit is contained in:
Silvan
2026-01-23 17:16:42 +01:00
committed by Silvan Fuhrer
parent 554b52c6a1
commit a416437561
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/navigator/rtl.cpp
+20 -5
View File
@@ -226,7 +226,10 @@ void RTL::on_activation()
case RtlType::RTL_DIRECT_MISSION_LAND: // Fall through
case RtlType::RTL_MISSION_FAST: // Fall through
case RtlType::RTL_MISSION_FAST_REVERSE:
_rtl_mission_type_handle->setReturnAltMin(_enforce_rtl_alt);
if (_rtl_mission_type_handle) {
_rtl_mission_type_handle->setReturnAltMin(_enforce_rtl_alt);
}
break;
case RtlType::RTL_DIRECT:
@@ -635,19 +638,31 @@ void RTL::initRtlMissionType(RtlType new_rtl_type, float rtl_alt)
switch (new_rtl_type) {
case RtlType::RTL_DIRECT_MISSION_LAND:
_rtl_mission_type_handle = new RtlDirectMissionLand(_navigator);
_rtl_mission_type_handle->setRtlAlt(rtl_alt);
_rtl_mission_type_handle->initialize();
if (_rtl_mission_type_handle) {
_rtl_mission_type_handle->setRtlAlt(rtl_alt);
_rtl_mission_type_handle->initialize();
}
// RTL type is either direct or mission land have to set it later.
break;
case RtlType::RTL_MISSION_FAST:
_rtl_mission_type_handle = new RtlMissionFast(_navigator, new_mission);
_rtl_mission_type_handle->initialize();
if (_rtl_mission_type_handle) {
_rtl_mission_type_handle->initialize();
}
break;
case RtlType::RTL_MISSION_FAST_REVERSE:
_rtl_mission_type_handle = new RtlMissionFastReverse(_navigator, new_mission);
_rtl_mission_type_handle->initialize();
if (_rtl_mission_type_handle) {
_rtl_mission_type_handle->initialize();
}
break;
default: