Changeset 165321 in webkit

Timestamp:

Mar 7, 2014 7:36:23 PM (10 years ago)

Author:

thiago.lacerda@openbossa.org

Message:

[WebRTC] Throw SYNTAX_ERROR when maxRetransmits and maxRetransmitTime are both set in RTCDataChannelInit
​https://bugs.webkit.org/show_bug.cgi?id=129894

Reviewed by Eric Carlson.

Source/WebCore:

Existing test was updated.

• Modules/mediastream/RTCDataChannel.cpp:

(WebCore::RTCDataChannel::create):

LayoutTests:

• fast/mediastream/RTCPeerConnection-datachannel-expected.txt:
• fast/mediastream/RTCPeerConnection-datachannel.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/mediastream/RTCPeerConnection-datachannel-expected.txt (modified) (1 diff)
• LayoutTests/fast/mediastream/RTCPeerConnection-datachannel.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediastream/RTCDataChannel.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-03-07  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>
+
+        [WebRTC] Throw SYNTAX_ERROR when maxRetransmits and maxRetransmitTime are both set in RTCDataChannelInit
+        https://bugs.webkit.org/show_bug.cgi?id=129894
+
+        Reviewed by Eric Carlson.
+
+        * fast/mediastream/RTCPeerConnection-datachannel-expected.txt:
+        * fast/mediastream/RTCPeerConnection-datachannel.html:
+
 2014-03-07  Martin Robinson  <mrobinson@igalia.com>
 

trunk/LayoutTests/fast/mediastream/RTCPeerConnection-datachannel-expected.txt

@@ -4 +4 @@
 
 
+PASS dc = pc.createDataChannel("label", {maxRetransmitTime:0, maxRetransmits:0}); threw exception Error: SyntaxError: DOM Exception 12.
 PASS dc = pc.createDataChannel("label1"); did not throw exception.
 PASS dc = pc.createDataChannel("label2", {}); did not throw exception.

trunk/LayoutTests/fast/mediastream/RTCPeerConnection-datachannel.html

@@ -83 +83 @@
 
             pc = new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}]});
+            shouldThrow('dc = pc.createDataChannel("label", {maxRetransmitTime:0, maxRetransmits:0});');
             shouldNotThrow('dc = pc.createDataChannel("label1");');
             shouldNotThrow('dc = pc.createDataChannel("label2", {});');

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-03-07  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>
+
+        [WebRTC] Throw SYNTAX_ERROR when maxRetransmits and maxRetransmitTime are both set in RTCDataChannelInit
+        https://bugs.webkit.org/show_bug.cgi?id=129894
+
+        Reviewed by Eric Carlson.
+
+        Existing test was updated.
+
+        * Modules/mediastream/RTCDataChannel.cpp:
+        (WebCore::RTCDataChannel::create):
+
 2014-03-07  Benjamin Poulain  <bpoulain@apple.com>
 

trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp

@@ -58 +58 @@
 {
     RTCDataChannelInit initData;
+    String maxRetransmitsStr;
+    String maxRetransmitTimeStr;
     options.get("ordered", initData.ordered);
     options.get("negotiated", initData.negotiated);
     options.get("id", initData.id);
-    options.get("maxRetransmits", initData.maxRetransmits);
-    options.get("maxRetransmitTime", initData.maxRetransmitTime);
+    options.get("maxRetransmits", maxRetransmitsStr);
+    options.get("maxRetransmitTime", maxRetransmitTimeStr);
     options.get("protocol", initData.protocol);
+
+    bool maxRetransmitsConversion;
+    bool maxRetransmitTimeConversion;
+    initData.maxRetransmits = maxRetransmitsStr.toUIntStrict(&maxRetransmitsConversion);
+    initData.maxRetransmitTime = maxRetransmitTimeStr.toUIntStrict(&maxRetransmitTimeConversion);
+    if (maxRetransmitsConversion && maxRetransmitTimeConversion) {
+        ec = SYNTAX_ERR;
+        return nullptr;
+    }
 
     std::unique_ptr<RTCDataChannelHandler> handler = peerConnectionHandler->createDataChannel(label, initData);