<!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>[191752] 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/191752">191752</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2015-10-29 13:51:28 -0700 (Thu, 29 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/191706">r191706</a>. rdar://problem/23319292</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="#branchessafari601branchSourceWebCoreloaderContentFiltercpp">branches/safari-601-branch/Source/WebCore/loader/ContentFilter.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestscontentfilteringallowemptydocumentexpectedhtml">branches/safari-601-branch/LayoutTests/contentfiltering/allow-empty-document-expected.html</a></li>
<li><a href="#branchessafari601branchLayoutTestscontentfilteringallowemptydocumenthtml">branches/safari-601-branch/LayoutTests/contentfiltering/allow-empty-document.html</a></li>
<li><a href="#branchessafari601branchLayoutTestscontentfilteringresourcesemptyhtml">branches/safari-601-branch/LayoutTests/contentfiltering/resources/empty.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 (191751 => 191752)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog 2015-10-29 20:18:56 UTC (rev 191751)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2015-10-29 20:51:28 UTC (rev 191752)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-10-29 Lucas Forschler <lforschler@apple.com>
+
+ Merge r191706. rdar://problem/23319292
+
+ 2015-10-28 Andy Estes <aestes@apple.com>
+
+ [Content Filtering] Crash when allowing a 0-byte resource to load
+ https://bugs.webkit.org/show_bug.cgi?id=150644
+ <rdar://problem/23288538>
+
+ Reviewed by Darin Adler.
+
+ * contentfiltering/allow-empty-document-expected.html: Added.
+ * contentfiltering/allow-empty-document.html: Added.
+ * contentfiltering/resources/empty.html: Added.
+
</ins><span class="cx"> 2015-10-26 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r191530. rdar://problem/23206864
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestscontentfilteringallowemptydocumentexpectedhtmlfromrev191706trunkLayoutTestscontentfilteringallowemptydocumentexpectedhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-601-branch/LayoutTests/contentfiltering/allow-empty-document-expected.html (from rev 191706, trunk/LayoutTests/contentfiltering/allow-empty-document-expected.html) (0 => 191752)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/contentfiltering/allow-empty-document-expected.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/contentfiltering/allow-empty-document-expected.html 2015-10-29 20:51:28 UTC (rev 191752)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+<!DOCTYPE html>
+<iframe src="resources/empty.html"></iframe>
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestscontentfilteringallowemptydocumenthtmlfromrev191706trunkLayoutTestscontentfilteringallowemptydocumenthtml"></a>
<div class="copfile"><h4>Copied: branches/safari-601-branch/LayoutTests/contentfiltering/allow-empty-document.html (from rev 191706, trunk/LayoutTests/contentfiltering/allow-empty-document.html) (0 => 191752)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/contentfiltering/allow-empty-document.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/contentfiltering/allow-empty-document.html 2015-10-29 20:51:28 UTC (rev 191752)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<!DOCTYPE html>
+<script>
+ if (window.internals) {
+ var settings = window.internals.mockContentFilterSettings;
+ settings.enabled = true;
+ settings.decisionPoint = settings.DECISION_POINT_AFTER_FINISHED_ADDING_DATA;
+ settings.decision = settings.DECISION_ALLOW;
+ }
+</script>
+<iframe src="resources/empty.html"></iframe>
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestscontentfilteringresourcesemptyhtmlfromrev191706trunkLayoutTestscontentfilteringresourcesemptyhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-601-branch/LayoutTests/contentfiltering/resources/empty.html (from rev 191706, trunk/LayoutTests/contentfiltering/resources/empty.html) ( => )</h4>
<pre class="diff"><span>
<span class="info">Modified: branches/safari-601-branch/Source/WebCore/ChangeLog
===================================================================
</span><del>--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-10-29 20:18:56 UTC (rev 191751)
</del><ins>+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-10-29 20:51:28 UTC (rev 191752)
</ins><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-10-29 Lucas Forschler <lforschler@apple.com>
+
+ Merge r191706. rdar://problem/23319292
+
+ 2015-10-28 Andy Estes <aestes@apple.com>
+
+ [Content Filtering] Crash when allowing a 0-byte resource to load
+ https://bugs.webkit.org/show_bug.cgi?id=150644
+ <rdar://problem/23288538>
+
+ Reviewed by Darin Adler.
+
+ Test: contentfiltering/allow-empty-document.html
+
+ * loader/ContentFilter.cpp:
+ (WebCore::ContentFilter::deliverResourceData): resourceBuffer will be null if the resource contained no data.
+
</ins><span class="cx"> 2015-10-27 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r191636. rdar://problem/23078059
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreloaderContentFiltercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/loader/ContentFilter.cpp (191751 => 191752)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/loader/ContentFilter.cpp 2015-10-29 20:18:56 UTC (rev 191751)
+++ branches/safari-601-branch/Source/WebCore/loader/ContentFilter.cpp 2015-10-29 20:51:28 UTC (rev 191752)
</span><span class="lines">@@ -259,8 +259,8 @@
</span><span class="cx"> void ContentFilter::deliverResourceData(CachedResource& resource)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(resource.dataBufferingPolicy() == BufferData);
</span><del>- const SharedBuffer& resourceBuffer = *resource.resourceBuffer();
- m_documentLoader.dataReceived(&resource, resourceBuffer.data(), resourceBuffer.size());
</del><ins>+ if (auto* resourceBuffer = resource.resourceBuffer())
+ m_documentLoader.dataReceived(&resource, resourceBuffer->data(), resourceBuffer->size());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>