Skip to content

Commit 36b0b2b

Browse files
authored
fix(operation mode manager): add nullptr check in onTimer (#7446)
Signed-off-by: Mamoru Sobue <mamoru.sobue@tier4.jp>
1 parent f87cf32 commit 36b0b2b

File tree

1 file changed

+10
-2
lines changed
  • control/autoware_operation_mode_transition_manager/src

1 file changed

+10
-2
lines changed

control/autoware_operation_mode_transition_manager/src/node.cpp

+10-2
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,16 @@ void OperationModeTransitionManager::processTransition()
206206

207207
void OperationModeTransitionManager::onTimer()
208208
{
209-
control_mode_report_ = *sub_control_mode_report_.takeData();
210-
gate_operation_mode_ = *sub_gate_operation_mode_.takeData();
209+
const auto control_mode_report_ptr = sub_control_mode_report_.takeData();
210+
if (!control_mode_report_ptr) {
211+
return;
212+
}
213+
const auto gate_operation_mode_ptr = sub_gate_operation_mode_.takeData();
214+
if (!gate_operation_mode_ptr) {
215+
return;
216+
}
217+
control_mode_report_ = *control_mode_report_ptr;
218+
gate_operation_mode_ = *gate_operation_mode_ptr;
211219

212220
for (const auto & [type, mode] : modes_) {
213221
mode->update(current_mode_ == type && transition_);

0 commit comments

Comments
 (0)