<!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>[188195] 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/188195">188195</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2015-08-09 13:01:15 -0700 (Sun, 09 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Crash in ComplexTextController when laying out obscure text
https://bugs.webkit.org/show_bug.cgi?id=147806
<rdar://problem/22102378>
Reviewed by Darin Adler.
Source/WebCore:
CTFontDescriptorCopyAttribute(fontDescriptor.get(), kCTFontReferenceURLAttribute) can return nullptr.
Test: fast/text/crash-obscure-text.html
* platform/graphics/mac/ComplexTextControllerCoreText.mm:
(WebCore::safeCFEqual):
(WebCore::ComplexTextController::collectComplexTextRunsForCharacters):
LayoutTests:
* fast/text/crash-obscure-text-expected.txt: Added.
* fast/text/crash-obscure-text.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacComplexTextControllerCoreTextmm">trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextcrashobscuretextexpectedtxt">trunk/LayoutTests/fast/text/crash-obscure-text-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasttextcrashobscuretexthtml">trunk/LayoutTests/fast/text/crash-obscure-text.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (188194 => 188195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-08-09 11:15:01 UTC (rev 188194)
+++ trunk/LayoutTests/ChangeLog 2015-08-09 20:01:15 UTC (rev 188195)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-08-09 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Crash in ComplexTextController when laying out obscure text
+ https://bugs.webkit.org/show_bug.cgi?id=147806
+ <rdar://problem/22102378>
+
+ Reviewed by Darin Adler.
+
+ * fast/text/crash-obscure-text-expected.txt: Added.
+ * fast/text/crash-obscure-text.html: Added.
+
</ins><span class="cx"> 2015-08-08 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove the webkit prefix from CanvasRenderingContext2D imageSmoothingEnabled
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextcrashobscuretextexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/crash-obscure-text-expected.txt (0 => 188195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/crash-obscure-text-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/text/crash-obscure-text-expected.txt 2015-08-09 20:01:15 UTC (rev 188195)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+This test makes sure we don't crash when encountering some particularly exotic codepoints. The test passes if we do not crash.
+
+ܘ̈
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/text/crash-obscure-text-expected.txt
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsfasttextcrashobscuretexthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/crash-obscure-text.html (0 => 188195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/crash-obscure-text.html (rev 0)
+++ trunk/LayoutTests/fast/text/crash-obscure-text.html 2015-08-09 20:01:15 UTC (rev 188195)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+<p>This test makes sure we don't crash when encountering some particularly exotic codepoints. The test passes if we do not crash.</p>
+&#x0718;&#x0308;
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (188194 => 188195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-09 11:15:01 UTC (rev 188194)
+++ trunk/Source/WebCore/ChangeLog 2015-08-09 20:01:15 UTC (rev 188195)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-08-09 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Crash in ComplexTextController when laying out obscure text
+ https://bugs.webkit.org/show_bug.cgi?id=147806
+ <rdar://problem/22102378>
+
+ Reviewed by Darin Adler.
+
+ CTFontDescriptorCopyAttribute(fontDescriptor.get(), kCTFontReferenceURLAttribute) can return nullptr.
+
+ Test: fast/text/crash-obscure-text.html
+
+ * platform/graphics/mac/ComplexTextControllerCoreText.mm:
+ (WebCore::safeCFEqual):
+ (WebCore::ComplexTextController::collectComplexTextRunsForCharacters):
+
</ins><span class="cx"> 2015-08-08 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove the webkit prefix from CanvasRenderingContext2D imageSmoothingEnabled
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacComplexTextControllerCoreTextmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm (188194 => 188195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm 2015-08-09 11:15:01 UTC (rev 188194)
+++ trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm 2015-08-09 20:01:15 UTC (rev 188195)
</span><span class="lines">@@ -189,6 +189,11 @@
</span><span class="cx"> return info->cp + stringIndex;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline bool safeCFEqual(CFTypeRef a, CFTypeRef b)
+{
+ return (!a && !b) || (a && b && CFEqual(a, b));
+}
+
</ins><span class="cx"> void ComplexTextController::collectComplexTextRunsForCharacters(const UChar* cp, unsigned length, unsigned stringLocation, const Font* font)
</span><span class="cx"> {
</span><span class="cx"> if (!font) {
</span><span class="lines">@@ -259,14 +264,14 @@
</span><span class="cx"> CTFontRef runCTFont = static_cast<CTFontRef>(CFDictionaryGetValue(runAttributes, kCTFontAttributeName));
</span><span class="cx"> ASSERT(CFGetTypeID(runCTFont) == CTFontGetTypeID());
</span><span class="cx"> RetainPtr<CFTypeRef> runFontEqualityObject = FontPlatformData::objectForEqualityCheck(runCTFont);
</span><del>- if (!CFEqual(runFontEqualityObject.get(), font->platformData().objectForEqualityCheck().get())) {
</del><ins>+ if (!safeCFEqual(runFontEqualityObject.get(), font->platformData().objectForEqualityCheck().get())) {
</ins><span class="cx"> // Begin trying to see if runFont matches any of the fonts in the fallback list.
</span><span class="cx">
</span><span class="cx"> for (unsigned i = 0; !m_font.fallbackRangesAt(i).isNull(); ++i) {
</span><span class="cx"> runFont = m_font.fallbackRangesAt(i).fontForCharacter(baseCharacter);
</span><span class="cx"> if (!runFont)
</span><span class="cx"> continue;
</span><del>- if (CFEqual(runFont->platformData().objectForEqualityCheck().get(), runFontEqualityObject.get()))
</del><ins>+ if (safeCFEqual(runFont->platformData().objectForEqualityCheck().get(), runFontEqualityObject.get()))
</ins><span class="cx"> break;
</span><span class="cx"> runFont = nullptr;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>