<!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>[164008] 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/164008">164008</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-02-12 20:05:10 -0800 (Wed, 12 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't crash when SerializedScriptValue deserialization fails
https://bugs.webkit.org/show_bug.cgi?id=128657
Reviewed by Oliver Hunt.
Source/WebCore:
Test: crypto/subtle/postMessage-worker.html
* bindings/js/JSMessageEventCustom.cpp: (WebCore::JSMessageEvent::data): Added a FIXME.
* bindings/js/SerializedScriptValue.cpp:
(WebCore::CloneBase::fail): Don't assert on failure.
(WebCore::SerializedScriptValue::deserialize): Never return a null JSValue, these
are not allowed.
LayoutTests:
* crypto/subtle/postMessage-worker-expected.txt:
* crypto/subtle/resources/postMessage-worker.js:
* platform/mac/TestExpectations:
Unskip the test, and land (unimportant) failure results.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestscryptosubtlepostMessageworkerexpectedtxt">trunk/LayoutTests/crypto/subtle/postMessage-worker-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtleresourcespostMessageworkerjs">trunk/LayoutTests/crypto/subtle/resources/postMessage-worker.js</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSMessageEventCustomcpp">trunk/Source/WebCore/bindings/js/JSMessageEventCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsSerializedScriptValuecpp">trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (164007 => 164008)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-13 03:34:33 UTC (rev 164007)
+++ trunk/LayoutTests/ChangeLog 2014-02-13 04:05:10 UTC (rev 164008)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-02-12 Alexey Proskuryakov <ap@apple.com>
+
+ Don't crash when SerializedScriptValue deserialization fails
+ https://bugs.webkit.org/show_bug.cgi?id=128657
+
+ Reviewed by Oliver Hunt.
+
+ * crypto/subtle/postMessage-worker-expected.txt:
+ * crypto/subtle/resources/postMessage-worker.js:
+ * platform/mac/TestExpectations:
+ Unskip the test, and land (unimportant) failure results.
+
</ins><span class="cx"> 2014-02-12 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> IDB: TestExpectations batch - "aborted-versionchange-closes.html to createObjectStore-null-name.html"
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtlepostMessageworkerexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/postMessage-worker-expected.txt (164007 => 164008)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/postMessage-worker-expected.txt 2014-02-13 03:34:33 UTC (rev 164007)
+++ trunk/LayoutTests/crypto/subtle/postMessage-worker-expected.txt 2014-02-13 04:05:10 UTC (rev 164008)
</span><span class="lines">@@ -3,12 +3,7 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-PASS All checks passed in worker
-PASS key.type is 'secret'
-PASS key.extractable is true
-PASS key.algorithm.name is 'HMAC'
-PASS key.algorithm.length is 16
-PASS key.usages is ["decrypt", "encrypt", "sign", "verify"]
</del><ins>+FAIL Check failed in worker: key is null
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtleresourcespostMessageworkerjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/resources/postMessage-worker.js (164007 => 164008)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/resources/postMessage-worker.js 2014-02-13 03:34:33 UTC (rev 164007)
+++ trunk/LayoutTests/crypto/subtle/resources/postMessage-worker.js 2014-02-13 04:05:10 UTC (rev 164008)
</span><span class="lines">@@ -1,6 +1,8 @@
</span><span class="cx"> onmessage = function(evt)
</span><span class="cx"> {
</span><span class="cx"> var key = evt.data;
</span><ins>+ if (!key)
+ postMessage({ result:false, message:'key is ' + key });
</ins><span class="cx"> if (key.type != 'secret')
</span><span class="cx"> postMessage({ result:false, message:'key.type should be "secret"' });
</span><span class="cx"> else if (!key.extractable)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (164007 => 164008)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2014-02-13 03:34:33 UTC (rev 164007)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2014-02-13 04:05:10 UTC (rev 164008)
</span><span class="lines">@@ -1245,9 +1245,6 @@
</span><span class="cx"> # SubtleCrypto is disabled on Mountain Lion
</span><span class="cx"> webkit.org/b/124261 [ MountainLion ] crypto/subtle [ Skip ]
</span><span class="cx">
</span><del>-# Deserialization of a CryptoKey in a worker fails with a crash.
-crypto/subtle/postMessage-worker.html [ Skip ]
-
</del><span class="cx"> webkit.org/b/124311 compositing/regions/transform-transparent-positioned-video-inside-region.html [ Pass ImageOnlyFailure ]
</span><span class="cx">
</span><span class="cx"> webkit.org/b/124321 [ Mavericks ] animations/resume-after-page-cache.html [ Pass Failure ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164007 => 164008)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-13 03:34:33 UTC (rev 164007)
+++ trunk/Source/WebCore/ChangeLog 2014-02-13 04:05:10 UTC (rev 164008)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-02-11 Alexey Proskuryakov <ap@apple.com>
+
+ Don't crash when SerializedScriptValue deserialization fails
+ https://bugs.webkit.org/show_bug.cgi?id=128657
+
+ Reviewed by Oliver Hunt.
+
+ Test: crypto/subtle/postMessage-worker.html
+
+ * bindings/js/JSMessageEventCustom.cpp: (WebCore::JSMessageEvent::data): Added a FIXME.
+
+ * bindings/js/SerializedScriptValue.cpp:
+ (WebCore::CloneBase::fail): Don't assert on failure.
+ (WebCore::SerializedScriptValue::deserialize): Never return a null JSValue, these
+ are not allowed.
+
</ins><span class="cx"> 2014-02-12 Bem Jones-Bey <bjonesbe@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSS Shapes] Rename shapeSize and others to make ShapeInfo and friends easier to understand
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSMessageEventCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSMessageEventCustom.cpp (164007 => 164008)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSMessageEventCustom.cpp 2014-02-13 03:34:33 UTC (rev 164007)
+++ trunk/Source/WebCore/bindings/js/JSMessageEventCustom.cpp 2014-02-13 04:05:10 UTC (rev 164008)
</span><span class="lines">@@ -64,9 +64,9 @@
</span><span class="cx"> case MessageEvent::DataTypeSerializedScriptValue:
</span><span class="cx"> if (RefPtr<SerializedScriptValue> serializedValue = event.dataAsSerializedScriptValue()) {
</span><span class="cx"> MessagePortArray ports = impl().ports();
</span><ins>+ // FIXME: Why does this suppress exceptions?
</ins><span class="cx"> result = serializedValue->deserialize(exec, globalObject(), &ports, NonThrowing);
</span><del>- }
- else
</del><ins>+ } else
</ins><span class="cx"> result = jsNull();
</span><span class="cx"> break;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsSerializedScriptValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp (164007 => 164008)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp 2014-02-13 03:34:33 UTC (rev 164007)
+++ trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp 2014-02-13 04:05:10 UTC (rev 164008)
</span><span class="lines">@@ -381,10 +381,8 @@
</span><span class="cx"> m_exec->vm().throwException(m_exec, createStackOverflowError(m_exec));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- NO_RETURN_DUE_TO_ASSERT
</del><span class="cx"> void fail()
</span><span class="cx"> {
</span><del>- ASSERT_NOT_REACHED();
</del><span class="cx"> m_failed = true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2641,7 +2639,7 @@
</span><span class="cx"> m_arrayBufferContentsArray.get(), m_data);
</span><span class="cx"> if (throwExceptions == Throwing)
</span><span class="cx"> maybeThrowExceptionIfSerializationFailed(exec, result.second);
</span><del>- return result.first;
</del><ins>+ return result.first ? result.first : jsNull();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValueRef SerializedScriptValue::deserialize(JSContextRef destinationContext, JSValueRef* exception)
</span><span class="lines">@@ -2653,7 +2651,7 @@
</span><span class="cx"> if (exception)
</span><span class="cx"> *exception = toRef(exec, exec->exception());
</span><span class="cx"> exec->clearException();
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx"> ASSERT(value);
</span><span class="cx"> return toRef(exec, value);
</span></span></pre>
</div>
</div>
</body>
</html>