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

Check upstream NOTICE prefix is non-nil

Browse Source
This commit is contained in:
Simon Ser 2020-04-29 15:00:17 +02:00
parent 976ae2e649
commit 2236142681
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
upstream.go
View File

@ -269,6 +269,10 @@ func (uc *upstreamConn) handleMessage(msg *irc.Message) error {
}) })
return nil return nil
case "NOTICE": case "NOTICE":
if msg.Prefix == nil {
return fmt.Errorf("expected a prefix")
}
if msg.Prefix.User == "" && msg.Prefix.Host == "" { // server message if msg.Prefix.User == "" && msg.Prefix.Host == "" { // server message
uc.produce("", msg, nil) uc.produce("", msg, nil)
} else { // regular user NOTICE } else { // regular user NOTICE
@ -1087,8 +1091,7 @@ func (uc *upstreamConn) handleMessage(msg *irc.Message) error {
} }
uc.produce(target, msg, nil) uc.produce(target, msg, nil)
case "INVITE": case "INVITE":
var nick string var nick, channel string
var channel string
if err := parseMessageParams(msg, &nick, &channel); err != nil { if err := parseMessageParams(msg, &nick, &channel); err != nil {
return err return err
} }
@ -1101,8 +1104,7 @@ func (uc *upstreamConn) handleMessage(msg *irc.Message) error {
}) })
}) })
case irc.RPL_INVITING: case irc.RPL_INVITING:
var nick string var nick, channel string
var channel string
if err := parseMessageParams(msg, &nick, &channel); err != nil { if err := parseMessageParams(msg, &nick, &channel); err != nil {
return err return err
} }