GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2024-11-15 00:19:29 +01:00
Code Issues Projects Releases Wiki Activity

always validate UTF8 from websockets

Browse Source
This commit is contained in:
Shivaram Lingamneni 2023-01-22 14:42:58 -05:00
parent 9439e9b9e1
commit abc71684f3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
irc/ircconn.go
View File

@ -133,7 +133,7 @@ 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, reader, err := wc.conn.NextReader() _, reader, err := wc.conn.NextReader()
switch err { switch err {
case nil: case nil:
// OK // OK
@ -148,7 +148,7 @@ func (wc *IRCWSConn) ReadLine() (line []byte, err error) {
case io.ErrUnexpectedEOF, io.EOF: case io.ErrUnexpectedEOF, io.EOF:
// these are OK. io.ErrUnexpectedEOF is the good case: // these are OK. io.ErrUnexpectedEOF is the good case:
// it means we read the full message and it consumed less than the full wc.buf // it means we read the full message and it consumed less than the full wc.buf
if messageType == websocket.BinaryMessage && !utf8.Valid(line) { if !utf8.Valid(line) {
return line, errInvalidUtf8 return line, errInvalidUtf8
} }
return line, nil return line, nil