Title: [164435] trunk/Source/WebCore
- Revision
- 164435
- Author
- psola...@apple.com
- Date
- 2014-02-20 10:23:24 -0800 (Thu, 20 Feb 2014)
Log Message
ASSERT in FrameLoader::shouldInterruptLoadForXFrameOptions
https://bugs.webkit.org/show_bug.cgi?id=129081
<rdar://problem/16026440>
Reviewed by Alexey Proskuryakov.
Do not assert if the server sends us a malformed X-Frame-Options header.
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::shouldInterruptLoadForXFrameOptions):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (164434 => 164435)
--- trunk/Source/WebCore/ChangeLog 2014-02-20 18:15:42 UTC (rev 164434)
+++ trunk/Source/WebCore/ChangeLog 2014-02-20 18:23:24 UTC (rev 164435)
@@ -1,3 +1,16 @@
+2014-02-19 Pratik Solanki <psola...@apple.com>
+
+ ASSERT in FrameLoader::shouldInterruptLoadForXFrameOptions
+ https://bugs.webkit.org/show_bug.cgi?id=129081
+ <rdar://problem/16026440>
+
+ Reviewed by Alexey Proskuryakov.
+
+ Do not assert if the server sends us a malformed X-Frame-Options header.
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::shouldInterruptLoadForXFrameOptions):
+
2014-02-20 Krzysztof Czech <k.cz...@samsung.com>
AX: Use auto to reduce some code in loops
Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (164434 => 164435)
--- trunk/Source/WebCore/loader/FrameLoader.cpp 2014-02-20 18:15:42 UTC (rev 164434)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2014-02-20 18:23:24 UTC (rev 164435)
@@ -3068,10 +3068,11 @@
case XFrameOptionsInvalid:
m_frame.document()->addConsoleMessage(MessageSource::JS, MessageLevel::Error, "Invalid 'X-Frame-Options' header encountered when loading '" + url.stringCenterEllipsizedToLength() + "': '" + content + "' is not a recognized directive. The header will be ignored.", requestIdentifier);
return false;
- default:
- ASSERT_NOT_REACHED();
+ case XFrameOptionsNone:
return false;
}
+ ASSERT_NOT_REACHED();
+ return false;
}
void FrameLoader::loadProvisionalItemFromCachedPage()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
