CHANGELOG.md

@@ -22,6 +22,10 @@ will consitute of a breaking change warranting a new major release:
   parameters better configurable. This should not affect the behaviour of the OBSW, but might
   make it more reliable and fix some corner cases.
 
+## Fixed
+
+- Missing `nullptr` checks for PLOC Supervisor handler, which could lead to crashes.
+
 # [v6.6.0] 2023-09-18
 
 ## Changed

linux/payload/PlocSupervisorHandler.cpp

@@ -1533,7 +1533,13 @@ void PlocSupervisorHandler::disableAllReplies() {
 
   /* Disable ack reply */
   iter = deviceReplyMap.find(ACK_REPORT);
+  if (iter == deviceReplyMap.end()) {
+    return;
+  }
   DeviceReplyInfo* info = &(iter->second);
+  if (info == nullptr) {
+    return;
+  }
   info->delayCycles = 0;
   info->command = deviceCommandMap.end();