Title: [191769] branches/safari-601.1.46-branch
- Revision
- 191769
- Author
- lforsch...@apple.com
- Date
- 2015-10-29 18:31:43 -0700 (Thu, 29 Oct 2015)
Log Message
Merged r191706. rdar://problem/23319282
Modified Paths
Added Paths
Diff
Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (191768 => 191769)
--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-10-30 01:28:23 UTC (rev 191768)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-10-30 01:31:43 UTC (rev 191769)
@@ -1,3 +1,19 @@
+2015-10-29 Lucas Forschler <lforsch...@apple.com>
+
+ Merge r191706. rdar://problem/23319282
+
+ 2015-10-28 Andy Estes <aes...@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.
+
2015-10-20 Matthew Hanson <matthew_han...@apple.com>
Merge r191364. rdar://problem/22864960
Copied: branches/safari-601.1.46-branch/LayoutTests/contentfiltering/allow-empty-document-expected.html (from rev 191706, trunk/LayoutTests/contentfiltering/allow-empty-document-expected.html) (0 => 191769)
--- branches/safari-601.1.46-branch/LayoutTests/contentfiltering/allow-empty-document-expected.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/contentfiltering/allow-empty-document-expected.html 2015-10-30 01:31:43 UTC (rev 191769)
@@ -0,0 +1,2 @@
+<!DOCTYPE html>
+<iframe src=""
Copied: branches/safari-601.1.46-branch/LayoutTests/contentfiltering/allow-empty-document.html (from rev 191706, trunk/LayoutTests/contentfiltering/allow-empty-document.html) (0 => 191769)
--- branches/safari-601.1.46-branch/LayoutTests/contentfiltering/allow-empty-document.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/contentfiltering/allow-empty-document.html 2015-10-30 01:31:43 UTC (rev 191769)
@@ -0,0 +1,10 @@
+<!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=""
Copied: branches/safari-601.1.46-branch/LayoutTests/contentfiltering/resources/empty.html (from rev 191706, trunk/LayoutTests/contentfiltering/resources/empty.html) ( => )
Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog
===================================================================
--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-10-30 01:28:23 UTC (rev 191768)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-10-30 01:31:43 UTC (rev 191769)
@@ -1,3 +1,20 @@
+2015-10-29 Lucas Forschler <lforsch...@apple.com>
+
+ Merge r191706. rdar://problem/23319282
+
+ 2015-10-28 Andy Estes <aes...@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.
+
2015-10-27 Matthew Hanson <matthew_han...@apple.com>
Merge r191636. rdar://problem/23077744
Modified: branches/safari-601.1.46-branch/Source/WebCore/loader/ContentFilter.cpp (191768 => 191769)
--- branches/safari-601.1.46-branch/Source/WebCore/loader/ContentFilter.cpp 2015-10-30 01:28:23 UTC (rev 191768)
+++ branches/safari-601.1.46-branch/Source/WebCore/loader/ContentFilter.cpp 2015-10-30 01:31:43 UTC (rev 191769)
@@ -259,8 +259,8 @@
void ContentFilter::deliverResourceData(CachedResource& resource)
{
ASSERT(resource.dataBufferingPolicy() == BufferData);
- const SharedBuffer& resourceBuffer = *resource.resourceBuffer();
- m_documentLoader.dataReceived(&resource, resourceBuffer.data(), resourceBuffer.size());
+ if (auto* resourceBuffer = resource.resourceBuffer())
+ m_documentLoader.dataReceived(&resource, resourceBuffer->data(), resourceBuffer->size());
}
} // namespace WebCore
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
