X-Git-Url: https://git.webkit.org/?p=WebKit-https.git;a=blobdiff_plain;f=WebKitTools%2Fpywebsocket%2Fmod_pywebsocket%2Fmsgutil.py;h=9fa9b59a5c9e2ea49c1af7cc3e60d27a33cc29c4;hp=bdb554de85240b4e1111ff47e6465514adc54966;hb=69e9301ccf909af3cadb3352a4037c232a48fe27;hpb=02133e30a93b23171944894835bff7ea98dfb2a7

diff --git a/WebKitTools/pywebsocket/mod_pywebsocket/msgutil.py b/WebKitTools/pywebsocket/mod_pywebsocket/msgutil.py
index bdb554de8524..9fa9b59a5c9e 100644
--- a/WebKitTools/pywebsocket/mod_pywebsocket/msgutil.py
+++ b/WebKitTools/pywebsocket/mod_pywebsocket/msgutil.py
@@ -73,7 +73,9 @@ def receive_message(request):
         else:
             # The payload is delimited with \xff.
             bytes = _read_until(request, '\xff')
-            message = bytes.decode('utf-8')
+            # The Web Socket protocol section 4.4 specifies that invalid
+            # characters must be replaced with U+fffd REPLACEMENT CHARACTER.
+            message = bytes.decode('utf-8', 'replace')
             if frame_type == 0x00:
                 return message
             # Discard data of other types.