<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[214037] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/214037">214037</a></dd>
<dt>Author</dt> <dd>clopez@igalia.com</dd>
<dt>Date</dt> <dd>2017-03-16 04:59:24 -0700 (Thu, 16 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebRTC] SDP sess-id in the "o=" line should be a value between 0 and LLONG_MAX.
https://bugs.webkit.org/show_bug.cgi?id=169681
Reviewed by Alejandro G. Castro.
Source/WebCore:
Use an int64_t type for storing sess-id and ensure that the value generated is always between 0 and LLONG_MAX (2^63-1).
To the JS world (sdp.js) we pass and read this value as a string type.
The JS world (sdp.js) was already using a string type for sess-id.
This caused a bug when reading the sess-id value at configurationFromJSON(): no value was obtained because a numeric type was expected.
So, after this patch, sess-id is passed and read as a string from sdp.js, and converted to an int64_t type for internal use.
This way we also avoid a rounding problem that happens with values near LLONG_MAX when converting from int64_t to double when passed to the JS world,
and that could cause that we end passing a number bigger than LLONG_MAX to sdp.js.
* Modules/mediastream/SDPProcessor.cpp:
(WebCore::configurationFromJSON):
(WebCore::configurationToJSON):
* platform/mediastream/MediaEndpointSessionConfiguration.h:
(WebCore::MediaEndpointSessionConfiguration::sessionId):
(WebCore::MediaEndpointSessionConfiguration::setSessionId):
(WebCore::MediaEndpointSessionConfiguration::MediaEndpointSessionConfiguration):
LayoutTests:
Check that the generated sess-id value its between the limits before validating it.
This is covered by the tests fast/mediastream/RTCPeerConnection-inspect-answer.html
and fast/mediastream/RTCPeerConnection-inspect-offer.html.
Both tests will fail if the sess-id value generated is not within the limits.
* fast/mediastream/resources/sdp-utils.js:
(printComparableSessionDescription):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamresourcessdputilsjs">trunk/LayoutTests/fast/mediastream/resources/sdp-utils.js</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamSDPProcessorcpp">trunk/Source/WebCore/Modules/mediastream/SDPProcessor.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaEndpointSessionConfigurationh">trunk/Source/WebCore/platform/mediastream/MediaEndpointSessionConfiguration.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (214036 => 214037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-03-16 11:55:13 UTC (rev 214036)
+++ trunk/LayoutTests/ChangeLog 2017-03-16 11:59:24 UTC (rev 214037)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-03-16 Carlos Alberto Lopez Perez <clopez@igalia.com>
+
+ [WebRTC] SDP sess-id in the "o=" line should be a value between 0 and LLONG_MAX.
+ https://bugs.webkit.org/show_bug.cgi?id=169681
+
+ Reviewed by Alejandro G. Castro.
+
+ Check that the generated sess-id value its between the limits before validating it.
+ This is covered by the tests fast/mediastream/RTCPeerConnection-inspect-answer.html
+ and fast/mediastream/RTCPeerConnection-inspect-offer.html.
+ Both tests will fail if the sess-id value generated is not within the limits.
+
+ * fast/mediastream/resources/sdp-utils.js:
+ (printComparableSessionDescription):
+
</ins><span class="cx"> 2017-03-15 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Do not reparent floating object until after intruding/overhanging dependency is cleared.
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamresourcessdputilsjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/resources/sdp-utils.js (214036 => 214037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/resources/sdp-utils.js 2017-03-16 11:55:13 UTC (rev 214036)
+++ trunk/LayoutTests/fast/mediastream/resources/sdp-utils.js 2017-03-16 11:59:24 UTC (rev 214037)
</span><span class="lines">@@ -27,9 +27,12 @@
</span><span class="cx"> // Session block
</span><span class="cx"> var oline;
</span><span class="cx">
</span><del>- if (oline = match(line, regexp.oline))
- line = line.replace(oline[2], verified("session-id"));
- else if (match(line, regexp.msidsemantic)) {
</del><ins>+ if (oline = match(line, regexp.oline)) {
+ var sessid = parseInt(oline[2]);
+ // The session-id should be a number between 0 and LLONG_MAX (2^63-1).
+ if (sessid >= 0 && sessid <= 9223372036854775807)
+ line = line.replace(oline[2], verified("session-id"));
+ } else if (match(line, regexp.msidsemantic)) {
</ins><span class="cx"> mdescVariables.forEach(function (variables) {
</span><span class="cx"> line = line.replace(variables.streamId, verified("media-stream-id"));
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214036 => 214037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-16 11:55:13 UTC (rev 214036)
+++ trunk/Source/WebCore/ChangeLog 2017-03-16 11:59:24 UTC (rev 214037)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2017-03-16 Carlos Alberto Lopez Perez <clopez@igalia.com>
+
+ [WebRTC] SDP sess-id in the "o=" line should be a value between 0 and LLONG_MAX.
+ https://bugs.webkit.org/show_bug.cgi?id=169681
+
+ Reviewed by Alejandro G. Castro.
+
+ Use an int64_t type for storing sess-id and ensure that the value generated is always between 0 and LLONG_MAX (2^63-1).
+ To the JS world (sdp.js) we pass and read this value as a string type.
+
+ The JS world (sdp.js) was already using a string type for sess-id.
+ This caused a bug when reading the sess-id value at configurationFromJSON(): no value was obtained because a numeric type was expected.
+
+ So, after this patch, sess-id is passed and read as a string from sdp.js, and converted to an int64_t type for internal use.
+ This way we also avoid a rounding problem that happens with values near LLONG_MAX when converting from int64_t to double when passed to the JS world,
+ and that could cause that we end passing a number bigger than LLONG_MAX to sdp.js.
+
+ * Modules/mediastream/SDPProcessor.cpp:
+ (WebCore::configurationFromJSON):
+ (WebCore::configurationToJSON):
+ * platform/mediastream/MediaEndpointSessionConfiguration.h:
+ (WebCore::MediaEndpointSessionConfiguration::sessionId):
+ (WebCore::MediaEndpointSessionConfiguration::setSessionId):
+ (WebCore::MediaEndpointSessionConfiguration::MediaEndpointSessionConfiguration):
+
</ins><span class="cx"> 2017-03-15 Jon Lee <jonlee@apple.com>
</span><span class="cx">
</span><span class="cx"> Flatten RTC enum naming
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamSDPProcessorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/SDPProcessor.cpp (214036 => 214037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/SDPProcessor.cpp 2017-03-16 11:55:13 UTC (rev 214036)
+++ trunk/Source/WebCore/Modules/mediastream/SDPProcessor.cpp 2017-03-16 11:59:24 UTC (rev 214037)
</span><span class="lines">@@ -182,13 +182,12 @@
</span><span class="cx">
</span><span class="cx"> String stringValue;
</span><span class="cx"> unsigned intValue;
</span><del>- unsigned long longValue;
</del><span class="cx"> bool boolValue;
</span><span class="cx">
</span><span class="cx"> RefPtr<InspectorObject> originatorObject = InspectorObject::create();
</span><span class="cx"> if (object->getObject(originatorString(), originatorObject)) {
</span><del>- if (originatorObject->getInteger(sessionIdString(), longValue))
- configuration->setSessionId(longValue);
</del><ins>+ if (originatorObject->getString(sessionIdString(), stringValue))
+ configuration->setSessionId(stringValue.toInt64());
</ins><span class="cx"> if (originatorObject->getInteger(sessionVersionString(), intValue))
</span><span class="cx"> configuration->setSessionVersion(intValue);
</span><span class="cx"> }
</span><span class="lines">@@ -346,7 +345,7 @@
</span><span class="cx"> RefPtr<InspectorObject> object = InspectorObject::create();
</span><span class="cx">
</span><span class="cx"> RefPtr<InspectorObject> originatorObject = InspectorObject::create();
</span><del>- originatorObject->setDouble(sessionIdString(), configuration.sessionId());
</del><ins>+ originatorObject->setString(sessionIdString(), String::number(configuration.sessionId()));
</ins><span class="cx"> originatorObject->setInteger(sessionVersionString(), configuration.sessionVersion());
</span><span class="cx"> object->setObject(originatorString(), originatorObject);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaEndpointSessionConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaEndpointSessionConfiguration.h (214036 => 214037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaEndpointSessionConfiguration.h 2017-03-16 11:55:13 UTC (rev 214036)
+++ trunk/Source/WebCore/platform/mediastream/MediaEndpointSessionConfiguration.h 2017-03-16 11:59:24 UTC (rev 214037)
</span><span class="lines">@@ -46,8 +46,8 @@
</span><span class="cx"> }
</span><span class="cx"> virtual ~MediaEndpointSessionConfiguration() { }
</span><span class="cx">
</span><del>- uint64_t sessionId() const { return m_sessionId; }
- void setSessionId(uint64_t sessionId) { m_sessionId = sessionId; }
</del><ins>+ int64_t sessionId() const { return m_sessionId; }
+ void setSessionId(int64_t sessionId) { m_sessionId = sessionId; }
</ins><span class="cx">
</span><span class="cx"> unsigned sessionVersion() const { return m_sessionVersion; }
</span><span class="cx"> void setSessionVersion(unsigned sessionVersion) { m_sessionVersion = sessionVersion; }
</span><span class="lines">@@ -70,10 +70,10 @@
</span><span class="cx"> MediaEndpointSessionConfiguration()
</span><span class="cx"> {
</span><span class="cx"> m_sessionId = cryptographicallyRandomNumber();
</span><del>- m_sessionId = m_sessionId << 32 | cryptographicallyRandomNumber();
</del><ins>+ m_sessionId = m_sessionId << 31 | cryptographicallyRandomNumber();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- uint64_t m_sessionId;
</del><ins>+ int64_t m_sessionId;
</ins><span class="cx"> unsigned m_sessionVersion { 0 };
</span><span class="cx">
</span><span class="cx"> Vector<PeerMediaDescription> m_mediaDescriptions;
</span></span></pre>
</div>
</div>
</body>
</html>