<!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>[184457] releases/WebKitGTK/webkit-2.4/Source</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/184457">184457</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-18 04:06:07 -0700 (Mon, 18 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/176803">r176803</a> - Serialization of MapData object provides unsafe access to internal types
https://bugs.webkit.org/show_bug.cgi?id=138653
Patch by Oliver Hunt <oliver@apple.com> on 2014-12-04
Reviewed by Geoffrey Garen.
Source/JavaScriptCore:
Converting these ASSERTs into RELEASE_ASSERTs, as it is now obvious
that despite trying hard to be safe in all cases it's simply to easy
to use an iterator in an unsafe state.
* runtime/MapData.h:
(JSC::MapData::const_iterator::key):
(JSC::MapData::const_iterator::value):
Source/WebCore:
We now keep the value portion of the key/value pair in MapData as a
separate stack. This allows us to maintain the spec semantic of
"atomic" serialisation of the key/value pair without retaining the
use of a potentially invalid iterator.
* bindings/js/SerializedScriptValue.cpp:
(WebCore::CloneSerializer::serialize):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24SourceJavaScriptCoreChangeLog">releases/WebKitGTK/webkit-2.4/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceJavaScriptCoreruntimeMapDatah">releases/WebKitGTK/webkit-2.4/Source/JavaScriptCore/runtime/MapData.h</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCorebindingsjsSerializedScriptValuecpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/bindings/js/SerializedScriptValue.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit24SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/JavaScriptCore/ChangeLog (184456 => 184457)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/JavaScriptCore/ChangeLog 2015-05-18 10:35:23 UTC (rev 184456)
+++ releases/WebKitGTK/webkit-2.4/Source/JavaScriptCore/ChangeLog 2015-05-18 11:06:07 UTC (rev 184457)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-12-04 Oliver Hunt <oliver@apple.com>
+
+ Serialization of MapData object provides unsafe access to internal types
+ https://bugs.webkit.org/show_bug.cgi?id=138653
+
+ Reviewed by Geoffrey Garen.
+
+ Converting these ASSERTs into RELEASE_ASSERTs, as it is now obvious
+ that despite trying hard to be safe in all cases it's simply to easy
+ to use an iterator in an unsafe state.
+
+ * runtime/MapData.h:
+ (JSC::MapData::const_iterator::key):
+ (JSC::MapData::const_iterator::value):
+
</ins><span class="cx"> 2014-10-27 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash when attempting to perform array iteration on a non-array with numeric keys not initialized.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceJavaScriptCoreruntimeMapDatah"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/JavaScriptCore/runtime/MapData.h (184456 => 184457)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/JavaScriptCore/runtime/MapData.h 2015-05-18 10:35:23 UTC (rev 184456)
+++ releases/WebKitGTK/webkit-2.4/Source/JavaScriptCore/runtime/MapData.h 2015-05-18 11:06:07 UTC (rev 184457)
</span><span class="lines">@@ -42,8 +42,8 @@
</span><span class="cx"> const_iterator(const MapData*);
</span><span class="cx"> ~const_iterator();
</span><span class="cx"> const WTF::KeyValuePair<JSValue, JSValue> operator*() const;
</span><del>- JSValue key() const { ASSERT(!atEnd()); return m_mapData->m_entries[m_index].key.get(); }
- JSValue value() const { ASSERT(!atEnd()); return m_mapData->m_entries[m_index].value.get(); }
</del><ins>+ JSValue key() const { RELEASE_ASSERT(!atEnd()); return m_mapData->m_entries[m_index].key.get(); }
+ JSValue value() const { RELEASE_ASSERT(!atEnd()); return m_mapData->m_entries[m_index].value.get(); }
</ins><span class="cx"> void operator++() { ASSERT(!atEnd()); internalIncrement(); }
</span><span class="cx"> static const_iterator end(const MapData*);
</span><span class="cx"> bool operator!=(const const_iterator& other);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog (184456 => 184457)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2015-05-18 10:35:23 UTC (rev 184456)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2015-05-18 11:06:07 UTC (rev 184457)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-12-04 Oliver Hunt <oliver@apple.com>
+
+ Serialization of MapData object provides unsafe access to internal types
+ https://bugs.webkit.org/show_bug.cgi?id=138653
+
+ Reviewed by Geoffrey Garen.
+
+ We now keep the value portion of the key/value pair in MapData as a
+ separate stack. This allows us to maintain the spec semantic of
+ "atomic" serialisation of the key/value pair without retaining the
+ use of a potentially invalid iterator.
+
+ * bindings/js/SerializedScriptValue.cpp:
+ (WebCore::CloneSerializer::serialize):
+
</ins><span class="cx"> 2014-10-29 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><span class="cx"> ASSERTION NOT REACHED because RenderStyle::setWordSpacing() does not handle a Length value of type 'Calculated'.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCorebindingsjsSerializedScriptValuecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/bindings/js/SerializedScriptValue.cpp (184456 => 184457)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/bindings/js/SerializedScriptValue.cpp 2015-05-18 10:35:23 UTC (rev 184456)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/bindings/js/SerializedScriptValue.cpp 2015-05-18 11:06:07 UTC (rev 184457)
</span><span class="lines">@@ -1164,6 +1164,7 @@
</span><span class="cx"> Vector<JSObject*, 32> inputObjectStack;
</span><span class="cx"> Vector<MapData*, 4> mapDataStack;
</span><span class="cx"> Vector<MapData::const_iterator, 4> iteratorStack;
</span><ins>+ Vector<JSValue, 4> iteratorValueStack;
</ins><span class="cx"> Vector<WalkerState, 16> stateStack;
</span><span class="cx"> WalkerState state = StateUnknown;
</span><span class="cx"> JSValue inValue = in;
</span><span class="lines">@@ -1332,16 +1333,20 @@
</span><span class="cx"> goto objectStartVisitMember;
</span><span class="cx"> }
</span><span class="cx"> inValue = ptr.key();
</span><ins>+ m_gcBuffer.append(ptr.value());
+ iteratorValueStack.append(ptr.value());
</ins><span class="cx"> stateStack.append(MapDataEndVisitKey);
</span><span class="cx"> goto stateUnknown;
</span><span class="cx"> }
</span><span class="cx"> case MapDataEndVisitKey: {
</span><del>- inValue = iteratorStack.last().value();
</del><ins>+ inValue = iteratorValueStack.last();
+ iteratorValueStack.removeLast();
</ins><span class="cx"> stateStack.append(MapDataEndVisitValue);
</span><span class="cx"> goto stateUnknown;
</span><span class="cx"> }
</span><span class="cx"> case MapDataEndVisitValue: {
</span><del>- ++iteratorStack.last();
</del><ins>+ if (iteratorStack.last() != mapDataStack.last()->end())
+ ++iteratorStack.last();
</ins><span class="cx"> goto mapDataStartVisitEntry;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>