Pārlūkot izejas kodu

backport fix for #2039

UTF8 should always be validated for websockets, regardless of the incoming
message type.
devel+resume2
Shivaram Lingamneni 1 gadu atpakaļ
vecāks
revīzija
e07fd9492a
1 mainītis faili ar 2 papildinājumiem un 2 dzēšanām
  1. 2
    2
      irc/ircconn.go

+ 2
- 2
irc/ircconn.go Parādīt failu

@@ -128,9 +128,9 @@ func (wc IRCWSConn) WriteLines(buffers [][]byte) (err error) {
128 128
 }
129 129
 
130 130
 func (wc IRCWSConn) ReadLine() (line []byte, err error) {
131
-	messageType, line, err := wc.conn.ReadMessage()
131
+	_, line, err = wc.conn.ReadMessage()
132 132
 	if err == nil {
133
-		if messageType == websocket.BinaryMessage && !utf8.Valid(line) {
133
+		if !utf8.Valid(line) {
134 134
 			return line, errInvalidUtf8
135 135
 		}
136 136
 		return line, nil

Notiek ielāde…
Atcelt
Saglabāt