<!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>[177909] 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/177909">177909</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-05 07:05:46 -0800 (Mon, 05 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WinCairo] Crash when font data pointer is null.
https://bugs.webkit.org/show_bug.cgi?id=139969
Patch by peavo@outlook.com <peavo@outlook.com> on 2015-01-05
Reviewed by Darin Adler.
Source/WebCore:
Added null pointer check.
Test: fonts/unicode-character-font-crash.html
* platform/graphics/win/UniscribeController.cpp:
(WebCore::UniscribeController::advance):
(WebCore::UniscribeController::shape):
LayoutTests:
* fonts/unicode-character-font-crash-expected.txt: Added.
* fonts/unicode-character-font-crash.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="#trunkSourceWebCoreplatformgraphicswinUniscribeControllercpp">trunk/Source/WebCore/platform/graphics/win/UniscribeController.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfontsunicodecharacterfontcrashexpectedtxt">trunk/LayoutTests/fonts/unicode-character-font-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfontsunicodecharacterfontcrashhtml">trunk/LayoutTests/fonts/unicode-character-font-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (177908 => 177909)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-01-05 13:07:59 UTC (rev 177908)
+++ trunk/LayoutTests/ChangeLog 2015-01-05 15:05:46 UTC (rev 177909)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-01-05 peavo@outlook.com <peavo@outlook.com>
+
+ [WinCairo] Crash when font data pointer is null.
+ https://bugs.webkit.org/show_bug.cgi?id=139969
+
+ Reviewed by Darin Adler.
+
+ * fonts/unicode-character-font-crash-expected.txt: Added.
+ * fonts/unicode-character-font-crash.html: Added.
+
</ins><span class="cx"> 2015-01-04 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> fast/events/autoscroll-should-not-stop-on-keypress.html is flaky in debug builds
</span></span></pre></div>
<a id="trunkLayoutTestsfontsunicodecharacterfontcrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fonts/unicode-character-font-crash-expected.txt (0 => 177909)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fonts/unicode-character-font-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/fonts/unicode-character-font-crash-expected.txt 2015-01-05 15:05:46 UTC (rev 177909)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+Test case for bug 139969: [WinCairo] Crash when font data pointer is null.
+
+This test passes if it does not crash.
+
+⟩
</ins></span></pre></div>
<a id="trunkLayoutTestsfontsunicodecharacterfontcrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fonts/unicode-character-font-crash.html (0 => 177909)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fonts/unicode-character-font-crash.html (rev 0)
+++ trunk/LayoutTests/fonts/unicode-character-font-crash.html 2015-01-05 15:05:46 UTC (rev 177909)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+<html>
+
+<head>
+<style>
+.texhtml{-webkit-font-feature-settings:"lnum","tnum"}
+</style>
+</head>
+
+<body>
+<p>Test case for <a href="http://bugs.webkit.org/show_bug.cgi?id=139969">bug 139969</a>: [WinCairo] Crash when font data pointer is null.</p>
+<p>This test passes if it does not crash.</p>
+<span class="texhtml">⟩</span>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+</body>
+
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177908 => 177909)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-05 13:07:59 UTC (rev 177908)
+++ trunk/Source/WebCore/ChangeLog 2015-01-05 15:05:46 UTC (rev 177909)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-01-05 peavo@outlook.com <peavo@outlook.com>
+
+ [WinCairo] Crash when font data pointer is null.
+ https://bugs.webkit.org/show_bug.cgi?id=139969
+
+ Reviewed by Darin Adler.
+
+ Added null pointer check.
+
+ Test: fonts/unicode-character-font-crash.html
+
+ * platform/graphics/win/UniscribeController.cpp:
+ (WebCore::UniscribeController::advance):
+ (WebCore::UniscribeController::shape):
+
</ins><span class="cx"> 2015-01-05 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GStreamer] Disable gst-plugin-scanner if seccomp filters are enabled
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinUniscribeControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/UniscribeController.cpp (177908 => 177909)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/UniscribeController.cpp 2015-01-05 13:07:59 UTC (rev 177908)
+++ trunk/Source/WebCore/platform/graphics/win/UniscribeController.cpp 2015-01-05 15:05:46 UTC (rev 177909)
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> smallCapsBuffer[index] = forceSmallCaps ? c : newC;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_fallbackFonts && nextFontData != fontData && fontData != m_font.primaryFont())
</del><ins>+ if (m_fallbackFonts && fontData && nextFontData != fontData && fontData != m_font.primaryFont())
</ins><span class="cx"> m_fallbackFonts->add(fontData);
</span><span class="cx">
</span><span class="cx"> if (nextFontData != fontData || nextIsSmallCaps != isSmallCaps) {
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx">
</span><span class="cx"> int itemLength = m_run.rtl() ? indexOfFontTransition + 1 : length - indexOfFontTransition;
</span><span class="cx"> if (itemLength) {
</span><del>- if (m_fallbackFonts && nextFontData != m_font.primaryFont())
</del><ins>+ if (m_fallbackFonts && nextFontData && nextFontData != m_font.primaryFont())
</ins><span class="cx"> m_fallbackFonts->add(nextFontData);
</span><span class="cx">
</span><span class="cx"> int itemStart = m_run.rtl() ? 0 : indexOfFontTransition;
</span><span class="lines">@@ -412,6 +412,10 @@
</span><span class="cx"> HFONT oldFont = 0;
</span><span class="cx"> HRESULT shapeResult = E_PENDING;
</span><span class="cx"> int glyphCount = 0;
</span><ins>+
+ if (!fontData)
+ return false;
+
</ins><span class="cx"> do {
</span><span class="cx"> shapeResult = ScriptShape(hdc, fontData->scriptCache(), str, len, glyphs.size(), &item.a,
</span><span class="cx"> glyphs.data(), clusters.data(), visualAttributes.data(), &glyphCount);
</span></span></pre>
</div>
</div>
</body>
</html>