sad/soju
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix panic in downstreamConn.sendNetworkHistory

Browse Source 
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
This commit is contained in:
Simon Ser 2020-08-26 15:28:10 +02:00
parent 43aa3e5529
commit 480d771a67
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
downstream.go
View File

@ -886,7 +886,7 @@ func (dc *downstreamConn) sendNetworkHistory(net *network) {
} }
limit := 4000 limit := 4000
history, err := loadHistoryLatestID(dc.network, target, lastDelivered, limit) history, err := loadHistoryLatestID(net, target, lastDelivered, limit)
if err != nil { if err != nil {
dc.logger.Printf("failed to send implicit history for %q: %v", target, err) dc.logger.Printf("failed to send implicit history for %q: %v", target, err)
continue continue
@ -970,7 +970,7 @@ func (dc *downstreamConn) handleMessageRegistered(msg *irc.Message) error {
if destination != "" && destination != dc.srv.Hostname { if destination != "" && destination != dc.srv.Hostname {
return ircError{&irc.Message{ return ircError{&irc.Message{
Command: irc.ERR_NOSUCHSERVER, Command: irc.ERR_NOSUCHSERVER,
Params: []string{dc.nick, destination, "No such server"}, Params: []string{dc.nick, destination, "No such server"},
}} }}
} }
dc.SendMessage(&irc.Message{ dc.SendMessage(&irc.Message{