From 480d771a676e5ded3378983d953cf6e197d0093a Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Wed, 26 Aug 2020 15:28:10 +0200 Subject: [PATCH] Fix panic in downstreamConn.sendNetworkHistory This panic happens when sending history to a multi-upstream client. sendNetworkHistory is called on each network, but dc.network is nil. Closes: https://todo.sr.ht/~emersion/soju/93 --- downstream.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/downstream.go b/downstream.go index 2c447f8..db721db 100644 --- a/downstream.go +++ b/downstream.go @@ -886,7 +886,7 @@ func (dc *downstreamConn) sendNetworkHistory(net *network) { } limit := 4000 - history, err := loadHistoryLatestID(dc.network, target, lastDelivered, limit) + history, err := loadHistoryLatestID(net, target, lastDelivered, limit) if err != nil { dc.logger.Printf("failed to send implicit history for %q: %v", target, err) continue @@ -970,7 +970,7 @@ func (dc *downstreamConn) handleMessageRegistered(msg *irc.Message) error { if destination != "" && destination != dc.srv.Hostname { return ircError{&irc.Message{ Command: irc.ERR_NOSUCHSERVER, - Params: []string{dc.nick, destination, "No such server"}, + Params: []string{dc.nick, destination, "No such server"}, }} } dc.SendMessage(&irc.Message{