<!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>[191055] 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/191055">191055</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-10-14 11:49:39 -0700 (Wed, 14 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/190339">r190339</a>. rdar://problem/23075538</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="#branchessafari601branchSourceWebCorexmlXSLStyleSheeth">branches/safari-601-branch/Source/WebCore/xml/XSLStyleSheet.h</a></li>
<li><a href="#branchessafari601branchSourceWebCorexmlXSLStyleSheetLibxsltcpp">branches/safari-601-branch/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestssvgcustominvalidxsltcrashexpectedtxt">branches/safari-601-branch/LayoutTests/svg/custom/invalid-xslt-crash-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestssvgcustominvalidxsltcrashsvg">branches/safari-601-branch/LayoutTests/svg/custom/invalid-xslt-crash.svg</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 (191054 => 191055)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog 2015-10-14 18:49:36 UTC (rev 191054)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2015-10-14 18:49:39 UTC (rev 191055)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2015-10-13 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r190339. rdar://problem/23075538
+
+ 2015-09-29 Jon Honeycutt <jhoneycutt@apple.com>
+
+ Avoid reparsing an XSLT stylesheet after the first failure.
+ https://bugs.webkit.org/show_bug.cgi?id=149188
+ <rdar://problem/22709912>
+
+ Reviewed by Dave Hyatt.
+
+ Patch by Jiewen Tan, jiewen_tan@apple.com.
+
+ * svg/custom/invalid-xslt-crash-expected.txt: Added.
+ * svg/custom/invalid-xslt-crash.svg: Added.
+
+2015-10-13 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r189421. rdar://problem/22802049
</span><span class="cx">
</span><span class="cx"> 2015-09-04 Myles C. Maxfield <mmaxfield@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestssvgcustominvalidxsltcrashexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/svg/custom/invalid-xslt-crash-expected.txt (0 => 191055)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/svg/custom/invalid-xslt-crash-expected.txt (rev 0)
+++ branches/safari-601-branch/LayoutTests/svg/custom/invalid-xslt-crash-expected.txt 2015-10-14 18:49:39 UTC (rev 191055)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestssvgcustominvalidxsltcrashsvg"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/svg/custom/invalid-xslt-crash.svg (0 => 191055)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/svg/custom/invalid-xslt-crash.svg (rev 0)
+++ branches/safari-601-branch/LayoutTests/svg/custom/invalid-xslt-crash.svg 2015-10-14 18:49:39 UTC (rev 191055)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+<?xml-stylesheet type="application/xml" href=""?>
+<svg xmlns="http://www.w3.org/2000/svg"
+ xmlns:xslt="http://www.w3.org/1999/XSL/Transform"
+ xslt:version="1.0">
+ <!-- The test passes if it doesn't crash -->
+ <xslt:attribute nnnnnnnnnnname="fill">lime</xslt:attribute>
+</svg>
</ins></span></pre></div>
<a id="branchessafari601branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (191054 => 191055)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-10-14 18:49:36 UTC (rev 191054)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-10-14 18:49:39 UTC (rev 191055)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2015-10-13 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r190339. rdar://problem/23075538
+
+ 2015-09-29 Jon Honeycutt <jhoneycutt@apple.com>
+
+ Avoid reparsing an XSLT stylesheet after the first failure.
+ https://bugs.webkit.org/show_bug.cgi?id=149188
+ <rdar://problem/22709912>
+
+ Reviewed by Dave Hyatt.
+
+ Patch by Jiewen Tan, jiewen_tan@apple.com.
+
+ Test: svg/custom/invalid-xslt-crash.svg
+
+ * xml/XSLStyleSheet.h:
+ Add a new member variable m_compilationFailed that tracks whether
+ compilation has failed. Default value is false.
+
+ * xml/XSLStyleSheetLibxslt.cpp:
+ (WebCore::XSLStyleSheet::compileStyleSheet):
+ Return early if the compilation has failed before. After compiling the
+ style sheet, if we failed, set m_compilationFailed to true.
+
+2015-10-13 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r190097. rdar://problem/23075540
</span><span class="cx">
</span><span class="cx"> 2015-09-21 Ryosuke Niwa <rniwa@webkit.org>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorexmlXSLStyleSheeth"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/xml/XSLStyleSheet.h (191054 => 191055)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/xml/XSLStyleSheet.h 2015-10-14 18:49:36 UTC (rev 191054)
+++ branches/safari-601-branch/Source/WebCore/xml/XSLStyleSheet.h 2015-10-14 18:49:39 UTC (rev 191055)
</span><span class="lines">@@ -116,7 +116,8 @@
</span><span class="cx">
</span><span class="cx"> xmlDocPtr m_stylesheetDoc;
</span><span class="cx"> bool m_stylesheetDocTaken;
</span><del>-
</del><ins>+ bool m_compilationFailed = false;
+
</ins><span class="cx"> XSLStyleSheet* m_parentStyleSheet;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorexmlXSLStyleSheetLibxsltcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp (191054 => 191055)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp 2015-10-14 18:49:36 UTC (rev 191054)
+++ branches/safari-601-branch/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp 2015-10-14 18:49:39 UTC (rev 191055)
</span><span class="lines">@@ -245,12 +245,19 @@
</span><span class="cx"> if (m_embedded)
</span><span class="cx"> return xsltLoadStylesheetPI(document());
</span><span class="cx">
</span><ins>+ // Certain libxslt versions are corrupting the xmlDoc on compilation
+ // failures - hence attempting to recompile after a failure is unsafe.
+ if (m_compilationFailed)
+ return 0;
+
</ins><span class="cx"> // xsltParseStylesheetDoc makes the document part of the stylesheet
</span><span class="cx"> // so we have to release our pointer to it.
</span><span class="cx"> ASSERT(!m_stylesheetDocTaken);
</span><span class="cx"> xsltStylesheetPtr result = xsltParseStylesheetDoc(m_stylesheetDoc);
</span><span class="cx"> if (result)
</span><span class="cx"> m_stylesheetDocTaken = true;
</span><ins>+ else
+ m_compilationFailed = true;
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>