<!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>[168208] branches/safari-537.76-branch/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/168208">168208</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2014-05-02 16:48:24 -0700 (Fri, 02 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/167548">r167548</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53776branchSourceJavaScriptCoreChangeLog">branches/safari-537.76-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari53776branchSourceJavaScriptCoredfgDFGOperationscpp">branches/safari-537.76-branch/Source/JavaScriptCore/dfg/DFGOperations.cpp</a></li>
<li><a href="#branchessafari53776branchSourceJavaScriptCoreruntimeOperationsh">branches/safari-537.76-branch/Source/JavaScriptCore/runtime/Operations.h</a></li>
<li><a href="#branchessafari53776branchSourceWTFChangeLog">branches/safari-537.76-branch/Source/WTF/ChangeLog</a></li>
<li><a href="#branchessafari53776branchSourceWTFwtfCheckedArithmetich">branches/safari-537.76-branch/Source/WTF/wtf/CheckedArithmetic.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53776branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.76-branch/Source/JavaScriptCore/ChangeLog (168207 => 168208)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.76-branch/Source/JavaScriptCore/ChangeLog 2014-05-02 23:38:30 UTC (rev 168207)
+++ branches/safari-537.76-branch/Source/JavaScriptCore/ChangeLog 2014-05-02 23:48:24 UTC (rev 168208)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2014-05-02 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r167548.
+
+ 2014-04-19 Filip Pizlo <fpizlo@apple.com>
+
+ Make it easier to check if an integer sum would overflow
+ https://bugs.webkit.org/show_bug.cgi?id=131900
+
+ Reviewed by Darin Adler.
+
+ * dfg/DFGOperations.cpp:
+ * runtime/Operations.h:
+ (JSC::jsString):
+
+2014-05-02 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r167544.
</span><span class="cx">
</span><span class="cx"> 2014-04-19 Filip Pizlo <fpizlo@apple.com>
</span></span></pre></div>
<a id="branchessafari53776branchSourceJavaScriptCoredfgDFGOperationscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.76-branch/Source/JavaScriptCore/dfg/DFGOperations.cpp (168207 => 168208)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.76-branch/Source/JavaScriptCore/dfg/DFGOperations.cpp 2014-05-02 23:38:30 UTC (rev 168207)
+++ branches/safari-537.76-branch/Source/JavaScriptCore/dfg/DFGOperations.cpp 2014-05-02 23:48:24 UTC (rev 168208)
</span><span class="lines">@@ -1596,8 +1596,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><span class="cx"> NativeCallFrameTracer tracer(&vm, exec);
</span><del>-
- if (static_cast<int32_t>(left->length() + right->length()) < 0) {
</del><ins>+
+ if (sumOverflows<int32_t>(left->length(), right->length())) {
</ins><span class="cx"> throwOutOfMemoryError(exec);
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -1610,10 +1610,7 @@
</span><span class="cx"> VM& vm = exec->vm();
</span><span class="cx"> NativeCallFrameTracer tracer(&vm, exec);
</span><span class="cx">
</span><del>- Checked<int32_t, RecordOverflow> length = a->length();
- length += b->length();
- length += c->length();
- if (length.hasOverflowed()) {
</del><ins>+ if (sumOverflows<int32_t>(a->length(), b->length(), c->length())) {
</ins><span class="cx"> throwOutOfMemoryError(exec);
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari53776branchSourceJavaScriptCoreruntimeOperationsh"></a>
<div class="modfile"><h4>Modified: branches/safari-537.76-branch/Source/JavaScriptCore/runtime/Operations.h (168207 => 168208)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.76-branch/Source/JavaScriptCore/runtime/Operations.h 2014-05-02 23:38:30 UTC (rev 168207)
+++ branches/safari-537.76-branch/Source/JavaScriptCore/runtime/Operations.h 2014-05-02 23:48:24 UTC (rev 168208)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> int32_t length2 = s2->length();
</span><span class="cx"> if (!length2)
</span><span class="cx"> return s1;
</span><del>- if ((length1 + length2) < 0)
</del><ins>+ if (sumOverflows<int32_t>(length1, length2))
</ins><span class="cx"> return throwOutOfMemoryError(exec);
</span><span class="cx">
</span><span class="cx"> return JSRopeString::create(vm, s1, s2);
</span><span class="lines">@@ -71,10 +71,8 @@
</span><span class="cx"> if (!length3)
</span><span class="cx"> return jsString(exec, jsString(vm, u1), jsString(vm, u2));
</span><span class="cx">
</span><del>- if ((length1 + length2) < 0)
</del><ins>+ if (sumOverflows<int32_t>(length1, length2, length3))
</ins><span class="cx"> return throwOutOfMemoryError(exec);
</span><del>- if ((length1 + length2 + length3) < 0)
- return throwOutOfMemoryError(exec);
</del><span class="cx">
</span><span class="cx"> return JSRopeString::create(exec->vm(), jsString(vm, u1), jsString(vm, u2), jsString(vm, u3));
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari53776branchSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.76-branch/Source/WTF/ChangeLog (168207 => 168208)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.76-branch/Source/WTF/ChangeLog 2014-05-02 23:38:30 UTC (rev 168207)
+++ branches/safari-537.76-branch/Source/WTF/ChangeLog 2014-05-02 23:48:24 UTC (rev 168208)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-05-02 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r167548.
+
+ 2014-04-19 Filip Pizlo <fpizlo@apple.com>
+
+ Make it easier to check if an integer sum would overflow
+ https://bugs.webkit.org/show_bug.cgi?id=131900
+
+ Reviewed by Darin Adler.
+
+ * wtf/CheckedArithmetic.h:
+ (WTF::checkedSum):
+ (WTF::sumOverflows):
+
</ins><span class="cx"> 2014-03-18 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed Win64 build fix; explicit operators are not valid in VS2010.
</span></span></pre></div>
<a id="branchessafari53776branchSourceWTFwtfCheckedArithmetich"></a>
<div class="modfile"><h4>Modified: branches/safari-537.76-branch/Source/WTF/wtf/CheckedArithmetic.h (168207 => 168208)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.76-branch/Source/WTF/wtf/CheckedArithmetic.h 2014-05-02 23:38:30 UTC (rev 168207)
+++ branches/safari-537.76-branch/Source/WTF/wtf/CheckedArithmetic.h 2014-05-02 23:48:24 UTC (rev 168208)
</span><span class="lines">@@ -712,10 +712,31 @@
</span><span class="cx"> return Checked<U, OverflowHandler>(lhs) * rhs;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template<typename T, typename U>
+Checked<T, RecordOverflow> checkedSum(U value)
+{
+ return Checked<T, RecordOverflow>(value);
</ins><span class="cx"> }
</span><ins>+template<typename T, typename U, typename... Args>
+Checked<T, RecordOverflow> checkedSum(U value, Args... args)
+{
+ return Checked<T, RecordOverflow>(value) + checkedSum<T>(args...);
+}
</ins><span class="cx">
</span><ins>+// Sometimes, you just want to check if some math would overflow - the code to do the math is
+// already in place, and you want to guard it.
+
+template<typename T, typename... Args> bool sumOverflows(Args... args)
+{
+ return checkedSum<T>(args...).hasOverflowed();
+}
+
+}
+
</ins><span class="cx"> using WTF::Checked;
</span><span class="cx"> using WTF::CheckedState;
</span><span class="cx"> using WTF::RecordOverflow;
</span><ins>+using WTF::checkedSum;
+using WTF::sumOverflows;
</ins><span class="cx">
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>