Browse Source

always validate UTF8 from websockets

tags/v2.12.0-rc1
Shivaram Lingamneni 1 year ago
parent
commit
abc71684f3
1 changed files with 2 additions and 2 deletions
  1. 2
    2
      irc/ircconn.go

+ 2
- 2
irc/ircconn.go View File

@@ -133,7 +133,7 @@ func (wc *IRCWSConn) WriteLines(buffers [][]byte) (err error) {
133 133
 }
134 134
 
135 135
 func (wc *IRCWSConn) ReadLine() (line []byte, err error) {
136
-	messageType, reader, err := wc.conn.NextReader()
136
+	_, reader, err := wc.conn.NextReader()
137 137
 	switch err {
138 138
 	case nil:
139 139
 		// OK
@@ -148,7 +148,7 @@ func (wc *IRCWSConn) ReadLine() (line []byte, err error) {
148 148
 	case io.ErrUnexpectedEOF, io.EOF:
149 149
 		// these are OK. io.ErrUnexpectedEOF is the good case:
150 150
 		// it means we read the full message and it consumed less than the full wc.buf
151
-		if messageType == websocket.BinaryMessage && !utf8.Valid(line) {
151
+		if !utf8.Valid(line) {
152 152
 			return line, errInvalidUtf8
153 153
 		}
154 154
 		return line, nil

Loading…
Cancel
Save