Merge pull request #559 from Icinga/segv

Heartbeat#sendEvent(m): nil-check m before dereferencing it
Icinga · Jun 5, 2023 · 78fa223 · 78fa223
2 parents 049a62b + 5a79a72
commit 78fa223
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/pkg/icingaredis/heartbeat.go b/pkg/icingaredis/heartbeat.go
@@ -179,9 +179,12 @@ func (h *Heartbeat) sendEvent(m *HeartbeatMessage) {
 	select {
 	case old := <-h.events:
 		if old != nil {
-			h.logger.Debugw("Previous heartbeat not read from channel",
-				zap.Time("previous", old.received),
-				zap.Time("current", m.received))
+			kv := []any{zap.Time("previous", old.received)}
+			if m != nil {
+				kv = append(kv, zap.Time("current", m.received))
+			}
+
+			h.logger.Debugw("Previous heartbeat not read from channel", kv...)
 		} else {
 			h.logger.Debug("Previous heartbeat loss event not read from channel")
 		}