Merge pull request #105 from fosrl/dev

Fix nil pointer deference
2026-03-21 22:03:38 -05:00 · 2026-03-19 16:16:06 -07:00 · 2026-03-19 15:21:50 -07:00
1 changed files with 15 additions and 0 deletions
--- a/olm/peer.go
+++ b/olm/peer.go
@@ -20,6 +20,11 @@ func (o *Olm) handleWgPeerAdd(msg websocket.WSMessage) {
 		return
 	}

+	if o.peerManager == nil {
+		logger.Debug("Ignoring add-peer message: peerManager is nil (shutdown in progress)")
+		return
+	}
+
 	jsonData, err := json.Marshal(msg.Data)
 	if err != nil {
 		logger.Error("Error marshaling data: %v", err)
@@ -76,6 +81,11 @@ func (o *Olm) handleWgPeerRemove(msg websocket.WSMessage) {
 		return
 	}

+	if o.peerManager == nil {
+		logger.Debug("Ignoring remove-peer message: peerManager is nil (shutdown in progress)")
+		return
+	}
+
 	jsonData, err := json.Marshal(msg.Data)
 	if err != nil {
 		logger.Error("Error marshaling data: %v", err)
@@ -113,6 +123,11 @@ func (o *Olm) handleWgPeerUpdate(msg websocket.WSMessage) {
 		return
 	}

+	if o.peerManager == nil {
+		logger.Debug("Ignoring update-peer message: peerManager is nil (shutdown in progress)")
+		return
+	}
+
 	jsonData, err := json.Marshal(msg.Data)
 	if err != nil {
 		logger.Error("Error marshaling data: %v", err)
Author	SHA1	Message	Date
Owen Schwartz	703fe4fe5d	Merge pull request #105 from fosrl/dev Fix nil pointer deference	2026-03-19 16:16:06 -07:00
Owen	42ef1f5ee3	Fix nil pointer deference	2026-03-19 15:21:50 -07:00