<!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>[51103] 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/51103">51103</a></dd>
<dt>Author</dt> <dd>hausmann@webkit.org</dd>
<dt>Date</dt> <dd>2009-11-18 02:29:05 -0800 (Wed, 18 Nov 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>[Qt] WebKit crashes when loading certain SVG images

Patch by Benjamin Poulain &lt;benjamin.poulain@nokia.com&gt; on 2009-11-18
Reviewed by Simon Hausmann.

WebCore:

Check if the familly exist before creating the PlatformData from it.

https://bugs.webkit.org/show_bug.cgi?id=29443

Test: svg/text/text-font-invalid.html

* platform/graphics/qt/FontFallbackListQt.cpp:
(WebCore::FontFallbackList::fontDataAt):

LayoutTests:

Added a test for a crash of QtWebkit when loading SVG images.

https://bugs.webkit.org/show_bug.cgi?id=29443

* svg/text/resources/text-font-invalid.svg: Added.
* svg/text/text-font-invalid-expected.txt: Added.
* svg/text/text-font-invalid.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreplatformgraphicsqtFontFallbackListQtcpp">trunk/WebCore/platform/graphics/qt/FontFallbackListQt.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li>trunk/LayoutTests/svg/text/resources/</li>
<li><a href="#trunkLayoutTestssvgtextresourcestextfontinvalidsvg">trunk/LayoutTests/svg/text/resources/text-font-invalid.svg</a></li>
<li><a href="#trunkLayoutTestssvgtexttextfontinvalidexpectedtxt">trunk/LayoutTests/svg/text/text-font-invalid-expected.txt</a></li>
<li><a href="#trunkLayoutTestssvgtexttextfontinvalidhtml">trunk/LayoutTests/svg/text/text-font-invalid.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (51102 => 51103)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2009-11-18 06:51:19 UTC (rev 51102)
+++ trunk/LayoutTests/ChangeLog        2009-11-18 10:29:05 UTC (rev 51103)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2009-11-18  Benjamin Poulain  &lt;benjamin.poulain@nokia.com&gt;
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] WebKit crashes when loading certain SVG images
+
+        Added a test for a crash of QtWebkit when loading SVG images.
+
+        https://bugs.webkit.org/show_bug.cgi?id=29443
+
+        * svg/text/resources/text-font-invalid.svg: Added.
+        * svg/text/text-font-invalid-expected.txt: Added.
+        * svg/text/text-font-invalid.html: Added.
+
</ins><span class="cx"> 2009-11-17  Hayato Ito  &lt;hayato@google.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Darin Adler.
</span></span></pre></div>
<a id="trunkLayoutTestssvgtextresourcestextfontinvalidsvg"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/text/resources/text-font-invalid.svg (0 => 51103)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/text/resources/text-font-invalid.svg                                (rev 0)
+++ trunk/LayoutTests/svg/text/resources/text-font-invalid.svg        2009-11-18 10:29:05 UTC (rev 51103)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+&lt;?xml version=&quot;1.0&quot;?&gt;
+&lt;!DOCTYPE svg PUBLIC &quot;-//W3C//DTD SVG 1.1//EN&quot; &quot;http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd&quot;&gt;
+&lt;svg xmlns=&quot;http://www.w3.org/2000/svg&quot; xmlns:xl=&quot;http://www.w3.org/1999/xlink&quot; version=&quot;1.1&quot;&gt;
+  &lt;defs&gt;
+    &lt;font-face font-family=&quot;Arbitrary font not on the system&quot;&gt;
+    &lt;font-face-src&gt;
+      &lt;font-face-name name=&quot;VeryUnlikelyToExistFont&quot;/&gt;
+    &lt;/font-face-src&gt;
+    &lt;/font-face&gt;
+  &lt;/defs&gt;
+  &lt;g&gt;
+    &lt;text&gt;
+      &lt;tspan font-family=&quot;Arbitrary font not on the system&quot;&gt;Foobar&lt;/tspan&gt;
+    &lt;/text&gt;
+  &lt;/g&gt;
+&lt;/svg&gt;
+
</ins></span></pre></div>
<a id="trunkLayoutTestssvgtexttextfontinvalidexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/text/text-font-invalid-expected.txt (0 => 51103)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/text/text-font-invalid-expected.txt                                (rev 0)
+++ trunk/LayoutTests/svg/text/text-font-invalid-expected.txt        2009-11-18 10:29:05 UTC (rev 51103)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+This test is to ensure that we do not crash when loading a SVG image without a valid font-family
+PASS: Did not crash when rendering the SVG image.
+
</ins></span></pre></div>
<a id="trunkLayoutTestssvgtexttextfontinvalidhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/text/text-font-invalid.html (0 => 51103)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/text/text-font-invalid.html                                (rev 0)
+++ trunk/LayoutTests/svg/text/text-font-invalid.html        2009-11-18 10:29:05 UTC (rev 51103)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+&lt;html&gt;
+  &lt;body&gt;
+    This test is to ensure that we do not crash when loading a SVG image without a valid font-family
+    &lt;div id=&quot;log&quot;&gt;&lt;span style='color: red;'&gt;FAIL:&lt;/span&gt; Did not complete test&lt;/div&gt;
+    &lt;img src=&quot;resources/text-font-invalid.svg&quot; /&gt;
+    &lt;script&gt;
+        if (window.layoutTestController)
+            layoutTestController.dumpAsText();
+        document.getElementById(&quot;log&quot;).innerHTML = &quot;&lt;span style='color: green;'&gt;PASS:&lt;/span&gt; Did not crash when rendering the SVG image.&quot;;
+    &lt;/script&gt;
+  &lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (51102 => 51103)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2009-11-18 06:51:19 UTC (rev 51102)
+++ trunk/WebCore/ChangeLog        2009-11-18 10:29:05 UTC (rev 51103)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2009-11-18  Benjamin Poulain  &lt;benjamin.poulain@nokia.com&gt;
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] WebKit crashes when loading certain SVG images
+
+        Check if the familly exist before creating the PlatformData from it.
+
+        https://bugs.webkit.org/show_bug.cgi?id=29443
+
+        Test: svg/text/text-font-invalid.html
+
+        * platform/graphics/qt/FontFallbackListQt.cpp:
+        (WebCore::FontFallbackList::fontDataAt):
+
</ins><span class="cx"> 2009-11-17  Nicolas Weber  &lt;thakis@chromium.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Darin Fisher.
</span></span></pre></div>
<a id="trunkWebCoreplatformgraphicsqtFontFallbackListQtcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/graphics/qt/FontFallbackListQt.cpp (51102 => 51103)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/graphics/qt/FontFallbackListQt.cpp        2009-11-18 06:51:19 UTC (rev 51102)
+++ trunk/WebCore/platform/graphics/qt/FontFallbackListQt.cpp        2009-11-18 10:29:05 UTC (rev 51103)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx">     const FontDescription&amp; description = _font-&gt;fontDescription();
</span><span class="cx">     const FontFamily* family = &amp;description.family();
</span><span class="cx">     while (family) {
</span><del>-        if (m_fontSelector) {
</del><ins>+        if (family-&gt;family().length() &amp;&amp; m_fontSelector) {
</ins><span class="cx">             FontData* data = m_fontSelector-&gt;getFontData(description, family-&gt;family());
</span><span class="cx">             if (data) {
</span><span class="cx">                 if (data-&gt;isLoading())
</span></span></pre>
</div>
</div>

</body>
</html>