[executor] Prevent crash on bad incoming message

AliceO2Group · Oct 6, 2023 · 5835229 · 5835229
1 parent d44acea
commit 5835229
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/executor/handlers.go b/executor/handlers.go
@@ -180,11 +180,17 @@ func handleMessageEvent(state *internalState, data []byte) (err error) {
 			var cmd *executorcmd.ExecutorCommand_Transition
 			cmd, err = activeTask.UnmarshalTransition(data)
 			if err != nil {
-				log.WithFields(logrus.Fields{
-					"name":    cmd.Name,
-					"message": string(data[:]),
-					"error":   err.Error(),
-				}).
+				fields := logrus.Fields{
+					"error": err.Error(),
+				}
+				if cmd != nil {
+					fields["name"] = cmd.Name
+				}
+				if len(data) > 0 {
+					fields["message"] = string(data[:])
+				}
+
+				log.WithFields(fields).
 					Error("cannot unmarshal incoming MESSAGE")
 				return
 			}