kapitan/IXWebSocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sending invalid UTF-8 TEXT message should fail and close the connection (fix **tons** of autobahn test: 6.X UTF-8 Handling)

Browse Source
This commit is contained in:
Benjamin Sergeant
2019-09-03 10:30:22 -07:00
parent 82213fd3a5
commit 172cd39702
6 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ixwebsocket/IXWebSocket.cpp
View File

@ -447,9 +447,7 @@ namespace ix
bool binary,
const OnProgressCallback& onProgressCallback)
{
return sendMessage(data,
(binary) ? SendMessageKind::Binary: SendMessageKind::Text,
onProgressCallback);
return (binary) ? sendBinary(data, onProgressCallback) : sendText(data, onProgressCallback);
}
WebSocketSendInfo WebSocket::sendBinary(const std::string& text,
@ -463,7 +461,8 @@ namespace ix
{
if (!isValidUtf8(text))
{
stop();
close(WebSocketCloseConstants::kNormalClosureCode,
WebSocketCloseConstants::kInvalidUtf8);
return false;
}
return sendMessage(text, SendMessageKind::Text, onProgressCallback);