From 3d6a009a967c4df4a57e494dfda13bf934365670 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Tue, 15 Aug 2017 16:33:25 -0700 Subject: [PATCH] Fix utf8 check for compressed frames --- CHANGELOG.md | 1 + include/boost/beast/websocket/impl/read.ipp | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd81af63..dec4d633 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ Version 107: WebSocket * Fix done state for WebSocket reads +* Fix utf8 check for compressed frames -------------------------------------------------------------------------------- diff --git a/include/boost/beast/websocket/impl/read.ipp b/include/boost/beast/websocket/impl/read.ipp index 071d9fa2..47a8501f 100644 --- a/include/boost/beast/websocket/impl/read.ipp +++ b/include/boost/beast/websocket/impl/read.ipp @@ -543,8 +543,7 @@ operator()( // check utf8 if(! ws_.rd_.utf8.write( buffer_prefix(bytes_written_, cb_.get())) || ( - ws_.rd_.remain == 0 && ws_.rd_.fh.fin && - ! ws_.rd_.utf8.finish())) + ws_.rd_.done && ! ws_.rd_.utf8.finish())) { // _Fail the WebSocket Connection_ code = close_code::bad_payload; @@ -1241,8 +1240,7 @@ loop: // check utf8 if(! rd_.utf8.write( buffer_prefix(bytes_written, buffers)) || ( - rd_.remain == 0 && rd_.fh.fin && - ! rd_.utf8.finish())) + rd_.done && ! rd_.utf8.finish())) { // _Fail the WebSocket Connection_ do_fail(