CEF/ergo
1
0
Fork 0
forked from External/ergo
Code Pull requests Activity

fix #1596

Browse source 
All truncation must be made UTF8-safe.
This commit is contained in:
Shivaram Lingamneni 2021-03-18 03:49:12 -04:00
parent cd43fae478
commit e447c61c73
2 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
irc/channel.go
View file

@ -13,6 +13,8 @@ import (
"sync"
"github.com/goshuirc/irc-go/ircutils"
"github.com/oragono/oragono/irc/caps"
"github.com/oragono/oragono/irc/history"
"github.com/oragono/oragono/irc/modes"
@ -1259,10 +1261,7 @@ func (channel *Channel) SetTopic(client *Client, topic string, rb *ResponseBuffe
return
}
topicLimit := client.server.Config().Limits.TopicLen
if len(topic) > topicLimit {
topic = topic[:topicLimit]
}
topic = ircutils.TruncateUTF8Safe(topic, client.server.Config().Limits.TopicLen)
channel.stateMutex.Lock()
chname := channel.name
@ -1520,10 +1519,7 @@ func (channel *Channel) Kick(client *Client, target *Client, comment string, rb
return
}
kicklimit := channel.server.Config().Limits.KickLen
if len(comment) > kicklimit {
comment = comment[:kicklimit]
}
comment = ircutils.TruncateUTF8Safe(comment, channel.server.Config().Limits.KickLen)
message := utils.MakeMessage(comment)
details := client.Details()