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

simplify utf8 validation of incoming WS lines

Browse source 
As of #1483, websockets entail enforce-utf8, so there's no need
to check globalUTF8EnforcementSetting when handling websockets.
This commit is contained in:
Shivaram Lingamneni 2021-02-26 03:10:30 -05:00
parent d547d05205
commit e9d42e02a2
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
irc/ircconn.go
View file

@ -126,11 +126,9 @@ func (wc IRCWSConn) WriteLines(buffers [][]byte) (err error) {
func (wc IRCWSConn) ReadLine() (line []byte, err error) { func (wc IRCWSConn) ReadLine() (line []byte, err error) {
messageType, line, err := wc.conn.ReadMessage() messageType, line, err := wc.conn.ReadMessage()
if err == nil { if err == nil {
if messageType == websocket.BinaryMessage && globalUtf8EnforcementSetting { if messageType == websocket.BinaryMessage && !utf8.Valid(line) {
if !utf8.Valid(line) {
return line, errInvalidUtf8 return line, errInvalidUtf8
} }
}
return line, nil return line, nil
} else if err == websocket.ErrReadLimit { } else if err == websocket.ErrReadLimit {
return line, ircreader.ErrReadQ return line, ircreader.ErrReadQ