<!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>[198406] branches/safari-601-branch</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/198406">198406</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-03-18 08:34:39 -0700 (Fri, 18 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/192499">r192499</a>. rdar://problem/25234850</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsChangeLog">branches/safari-601-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCoreChangeLog">branches/safari-601-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCoreplatformgraphicsFontCascadecpp">branches/safari-601-branch/Source/WebCore/platform/graphics/FontCascade.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestswebgl103151055_asanexpectedtxt">branches/safari-601-branch/LayoutTests/webgl/1.0.3/151055_asan-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestswebgl103151055_asanhtml">branches/safari-601-branch/LayoutTests/webgl/1.0.3/151055_asan.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/ChangeLog (198405 => 198406)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog 2016-03-18 15:30:20 UTC (rev 198405)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2016-03-18 15:34:39 UTC (rev 198406)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2016-03-18 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r192499.
+
+ 2015-11-16 Pranjal Jumde <pjumde@apple.com>
+
+ Checks for buffer-overflows when reading characters from textRun
+ https://bugs.webkit.org/attachment.cgi?bugid=151055
+ <rdar://problem/23251789>
+
+ Reviewed by Brent Fulgham.
+
+ * webgl/1.0.3/151055_asan-expected.txt
+ * webgl/1.0.3/151055_asan.html
+
+2016-03-18 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r192252.
</span><span class="cx">
</span><span class="cx"> 2015-11-10 Zalan Bujtas <zalan@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestswebgl103151055_asanexpectedtxtfromrev192499trunkLayoutTestswebgl103151055_asanexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-601-branch/LayoutTests/webgl/1.0.3/151055_asan-expected.txt (from rev 192499, trunk/LayoutTests/webgl/1.0.3/151055_asan-expected.txt) (0 => 198406)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/webgl/1.0.3/151055_asan-expected.txt (rev 0)
+++ branches/safari-601-branch/LayoutTests/webgl/1.0.3/151055_asan-expected.txt 2016-03-18 15:34:39 UTC (rev 198406)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+This test passes if it doesn't crash. https://bugs.webkit.org/show_bug.cgi?id=151055.
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestswebgl103151055_asanhtmlfromrev192499trunkLayoutTestswebgl103151055_asanhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-601-branch/LayoutTests/webgl/1.0.3/151055_asan.html (from rev 192499, trunk/LayoutTests/webgl/1.0.3/151055_asan.html) (0 => 198406)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/webgl/1.0.3/151055_asan.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/webgl/1.0.3/151055_asan.html 2016-03-18 15:34:39 UTC (rev 198406)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+<style>
+ div {
+ width: 200px;
+ font-size: 20px;
+ text-decoration: underline;
+ }
+</style>
+<div id="webtest8" style="direction: rtl; text-align: justify;">
+This test passes if it doesn't crash. https://bugs.webkit.org/show_bug.cgi?id=151055.
+</div>
+<script>
+
+function webtest_fn_3() {
+ if (window.testRunner)
+ testRunner.dumpAsText();
+
+ var canvas = document.createElement("canvas");
+ gl = canvas.getContext("webgl");
+
+ try {
+ gl.isBuffer(document.getElementById("webtest8").appendChild(document.createElement("image")).createBuffer())
+ }
+ catch(er) { };
+
+ gl.viewport(document.getElementById("webtest8").appendChild(document.createElement("textarea")).cols, 0, 0, 32769);
+}
+webtest_fn_3();
+</script>
</ins></span></pre></div>
<a id="branchessafari601branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (198405 => 198406)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/ChangeLog 2016-03-18 15:30:20 UTC (rev 198405)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2016-03-18 15:34:39 UTC (rev 198406)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2016-03-18 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r192499.
+
+ 2015-11-16 Pranjal Jumde <pjumde@apple.com>
+
+ Fixes the buffer-overflow when reading characters from textRun
+ https://bugs.webkit.org/attachment.cgi?bugid=151055
+ <rdar://problem/23251789>
+
+ Reviewed by Brent Fulgham.
+
+ * platform/graphics/FontCascade.cpp
+
+2016-03-18 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r192252.
</span><span class="cx">
</span><span class="cx"> 2015-11-10 Zalan Bujtas <zalan@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreplatformgraphicsFontCascadecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/FontCascade.cpp (198405 => 198406)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/platform/graphics/FontCascade.cpp 2016-03-18 15:30:20 UTC (rev 198405)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/FontCascade.cpp 2016-03-18 15:34:39 UTC (rev 198406)
</span><span class="lines">@@ -1170,7 +1170,7 @@
</span><span class="cx"> UChar32 baseCharacter;
</span><span class="cx"> unsigned offsetInString = glyphBuffer.offsetInString(index);
</span><span class="cx">
</span><del>- if (offsetInString == GlyphBuffer::noOffset) {
</del><ins>+ if (offsetInString == GlyphBuffer::noOffset || offsetInString >= textRun.length()) {
</ins><span class="cx"> // We have no idea which character spawned this glyph. Bail.
</span><span class="cx"> return GlyphToPathTranslator::GlyphUnderlineType::DrawOverGlyph;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>