Changeset 230524 in webkit

Timestamp:

Apr 11, 2018 8:28:37 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

Fix a WebRTC data channel issue for non-ASCII characters.

At the sender side, buffer size are calulcated after UTF8 encoding. At the
receiver side, strings are constructed with UTF8 data.

​https://bugs.webkit.org/show_bug.cgi?id=184481

Patch by Jianjun Zhu <​jianjun.zhu@intel.com> on 2018-04-11
Reviewed by Youenn Fablet.

LayoutTests/imported/w3c:

• web-platform-tests/webrtc/RTCDataChannel-send-expected.txt:

Source/WebCore:

Updated test:
LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCDataChannel-send-expected.txt

• Modules/mediastream/libwebrtc/LibWebRTCDataChannelHandler.cpp:

(WebCore::LibWebRTCDataChannelHandler::sendStringData):
(WebCore::LibWebRTCDataChannelHandler::OnMessage):

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCDataChannel-send-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCDataChannelHandler.cpp (modified) (2 diffs)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2018-04-11  Jianjun Zhu  <jianjun.zhu@intel.com>
+
+        Fix a WebRTC data channel issue for non-ASCII characters.
+
+        At the sender side, buffer size are calulcated after UTF8 encoding. At the
+        receiver side, strings are constructed with UTF8 data.
+
+        https://bugs.webkit.org/show_bug.cgi?id=184481
+
+        Reviewed by Youenn Fablet.
+
+        * web-platform-tests/webrtc/RTCDataChannel-send-expected.txt:
+
 2018-04-09  Brendan McLoughlin  <brendan@bocoup.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCDataChannel-send-expected.txt

@@ -2 +2 @@
 PASS Calling send() when data channel is in connecting state should throw InvalidStateError 
 PASS Data channel should be able to send simple string and receive as string 
-FAIL Data channel should be able to send unicode string and receive as unicode string assert_equals: expected "世界你好" but got "世ç"
+PASS Data channel should be able to send unicode string and receive as unicode string 
 PASS Data channel should ignore binaryType and always receive string message as string 
 PASS Data channel should be able to send Uint8Array message and receive as ArrayBuffer 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-04-11  Jianjun Zhu  <jianjun.zhu@intel.com>
+
+        Fix a WebRTC data channel issue for non-ASCII characters.
+
+        At the sender side, buffer size are calulcated after UTF8 encoding. At the
+        receiver side, strings are constructed with UTF8 data.
+
+        https://bugs.webkit.org/show_bug.cgi?id=184481
+
+        Reviewed by Youenn Fablet.
+
+        Updated test:
+        LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCDataChannel-send-expected.txt
+
+        * Modules/mediastream/libwebrtc/LibWebRTCDataChannelHandler.cpp:
+        (WebCore::LibWebRTCDataChannelHandler::sendStringData):
+        (WebCore::LibWebRTCDataChannelHandler::OnMessage):
+
 2018-04-11  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCDataChannelHandler.cpp

@@ -48 +48 @@
 bool LibWebRTCDataChannelHandler::sendStringData(const String& text)
 {
-    return m_channel->Send({rtc::CopyOnWriteBuffer(text.utf8().data(), text.length()), false});
+    auto utf8Text = text.utf8();
+    return m_channel->Send({ rtc::CopyOnWriteBuffer(utf8Text.data(), utf8Text.length()), false });
 }
 
@@ -97 +98 @@
     std::unique_ptr<webrtc::DataBuffer> protectedBuffer(new webrtc::DataBuffer(buffer));
     callOnMainThread([protectedClient = makeRef(*m_client), buffer = WTFMove(protectedBuffer)] {
-        // FIXME: Ensure this is correct by adding some tests with non-ASCII characters.
-        const char* data = reinterpret_cast<const char*>(buffer->data.data());
+        const char* data = reinterpret_cast<const char*>(buffer->data.data<char>());
         if (buffer->binary)
             protectedClient->didReceiveRawData(data, buffer->size());
         else
-            protectedClient->didReceiveStringData(String(data, buffer->size()));
+            protectedClient->didReceiveStringData(String::fromUTF8(data, buffer->size()));
     });
 }