<!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>[199785] trunk/Source/WebCore</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/199785">199785</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-04-20 14:07:37 -0700 (Wed, 20 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use Optional<size_t> for OrderIterator::m_orderIndex instead of int
https://bugs.webkit.org/show_bug.cgi?id=156796
Reviewed by Anders Carlsson.
Use Optional<size_t> for OrderIterator::m_orderIndex instead of int
(with invalid value of -1). m_orderIndex a vector index and therefore
is in the range of an unsigned (type used internally by Vector, even
though the index is exposed as size_t). Therefore, assigning it to an
int is unsafe as it may overflow.
This may fix <rdar://problem/23410338> which is a top crasher.
* rendering/OrderIterator.cpp:
(WebCore::OrderIterator::next):
(WebCore::OrderIterator::reset):
* rendering/OrderIterator.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingOrderIteratorcpp">trunk/Source/WebCore/rendering/OrderIterator.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingOrderIteratorh">trunk/Source/WebCore/rendering/OrderIterator.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (199784 => 199785)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-20 21:07:02 UTC (rev 199784)
+++ trunk/Source/WebCore/ChangeLog 2016-04-20 21:07:37 UTC (rev 199785)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2016-04-20 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Use Optional<size_t> for OrderIterator::m_orderIndex instead of int
+ https://bugs.webkit.org/show_bug.cgi?id=156796
+
+ Reviewed by Anders Carlsson.
+
+ Use Optional<size_t> for OrderIterator::m_orderIndex instead of int
+ (with invalid value of -1). m_orderIndex a vector index and therefore
+ is in the range of an unsigned (type used internally by Vector, even
+ though the index is exposed as size_t). Therefore, assigning it to an
+ int is unsafe as it may overflow.
+
+ This may fix <rdar://problem/23410338> which is a top crasher.
+
+ * rendering/OrderIterator.cpp:
+ (WebCore::OrderIterator::next):
+ (WebCore::OrderIterator::reset):
+ * rendering/OrderIterator.h:
+
+2016-04-20 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Crash under needsAppleMailPaginationQuirk()
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=156806
</span><span class="cx"> <rdar://problem/23323479>
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingOrderIteratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/OrderIterator.cpp (199784 => 199785)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/OrderIterator.cpp 2016-04-20 21:07:02 UTC (rev 199784)
+++ trunk/Source/WebCore/rendering/OrderIterator.cpp 2016-04-20 21:07:37 UTC (rev 199785)
</span><span class="lines">@@ -36,8 +36,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static const int cInvalidIndex = -1;
-
</del><span class="cx"> OrderIterator::OrderIterator(RenderBox& containerBox)
</span><span class="cx"> : m_containerBox(containerBox)
</span><span class="cx"> {
</span><span class="lines">@@ -52,23 +50,22 @@
</span><span class="cx">
</span><span class="cx"> RenderBox* OrderIterator::next()
</span><span class="cx"> {
</span><del>- int endIndex = m_orderValues.size();
</del><span class="cx"> do {
</span><span class="cx"> if (m_currentChild) {
</span><span class="cx"> m_currentChild = m_currentChild->nextSiblingBox();
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_orderIndex != cInvalidIndex)
- ++m_orderIndex;
</del><ins>+ if (m_orderIndex)
+ ++m_orderIndex.value();
</ins><span class="cx"> else
</span><span class="cx"> m_orderIndex = 0;
</span><span class="cx">
</span><del>- if (m_orderIndex == endIndex)
</del><ins>+ if (m_orderIndex.value() >= m_orderValues.size())
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> m_currentChild = m_containerBox.firstChildBox();
</span><del>- } while (!m_currentChild || m_currentChild->style().order() != m_orderValues[m_orderIndex]);
</del><ins>+ } while (!m_currentChild || m_currentChild->style().order() != m_orderValues[m_orderIndex.value()]);
</ins><span class="cx">
</span><span class="cx"> return m_currentChild;
</span><span class="cx"> }
</span><span class="lines">@@ -76,7 +73,7 @@
</span><span class="cx"> void OrderIterator::reset()
</span><span class="cx"> {
</span><span class="cx"> m_currentChild = nullptr;
</span><del>- m_orderIndex = cInvalidIndex;
</del><ins>+ m_orderIndex = Nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> OrderIteratorPopulator::OrderIteratorPopulator(OrderIterator& iterator)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingOrderIteratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/OrderIterator.h (199784 => 199785)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/OrderIterator.h 2016-04-20 21:07:02 UTC (rev 199784)
+++ trunk/Source/WebCore/rendering/OrderIterator.h 2016-04-20 21:07:37 UTC (rev 199785)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #define OrderIterator_h
</span><span class="cx">
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><ins>+#include <wtf/Optional.h>
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -56,7 +57,7 @@
</span><span class="cx"> RenderBox* m_currentChild;
</span><span class="cx">
</span><span class="cx"> Vector<int, 1> m_orderValues;
</span><del>- int m_orderIndex;
</del><ins>+ Optional<size_t> m_orderIndex;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class OrderIteratorPopulator {
</span></span></pre>
</div>
</div>
</body>
</html>