Title: [182823] trunk/Source/WebCore
- Revision
- 182823
- Author
- aes...@apple.com
- Date
- 2015-04-14 17:20:54 -0700 (Tue, 14 Apr 2015)
Log Message
[Content Filtering] Use ASSERT_WITH_SECURITY_IMPLICATION for verifying types from NEFilterSource
https://bugs.webkit.org/show_bug.cgi?id=143742
Reviewed by David Kilzer.
* platform/cocoa/NetworkExtensionContentFilter.mm:
(replacementDataFromDecisionInfo): ASSERT_WITH_SECURITY_IMPLICATION that decisionInfo is really a NSDictionary.
(WebCore::NetworkExtensionContentFilter::handleDecision): ASSERT_WITH_SECURITY_IMPLICATION that replacementData is really a NSData.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (182822 => 182823)
--- trunk/Source/WebCore/ChangeLog 2015-04-15 00:02:53 UTC (rev 182822)
+++ trunk/Source/WebCore/ChangeLog 2015-04-15 00:20:54 UTC (rev 182823)
@@ -1,3 +1,14 @@
+2015-04-14 Andy Estes <aes...@apple.com>
+
+ [Content Filtering] Use ASSERT_WITH_SECURITY_IMPLICATION for verifying types from NEFilterSource
+ https://bugs.webkit.org/show_bug.cgi?id=143742
+
+ Reviewed by David Kilzer.
+
+ * platform/cocoa/NetworkExtensionContentFilter.mm:
+ (replacementDataFromDecisionInfo): ASSERT_WITH_SECURITY_IMPLICATION that decisionInfo is really a NSDictionary.
+ (WebCore::NetworkExtensionContentFilter::handleDecision): ASSERT_WITH_SECURITY_IMPLICATION that replacementData is really a NSData.
+
2015-04-14 Brent Fulgham <bfulg...@apple.com>
Correct layering violation in DumpRenderTree Build
Modified: trunk/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.mm (182822 => 182823)
--- trunk/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.mm 2015-04-15 00:02:53 UTC (rev 182822)
+++ trunk/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.mm 2015-04-15 00:20:54 UTC (rev 182823)
@@ -44,9 +44,8 @@
#if HAVE(MODERN_NE_FILTER_SOURCE)
static inline NSData *replacementDataFromDecisionInfo(NSDictionary *decisionInfo)
{
- id replacementData = decisionInfo[NEFilterSourceOptionsPageData];
- ASSERT(!replacementData || [replacementData isKindOfClass:[NSData class]]);
- return replacementData;
+ ASSERT_WITH_SECURITY_IMPLICATION(!decisionInfo || [decisionInfo isKindOfClass:[NSDictionary class]]);
+ return decisionInfo[NEFilterSourceOptionsPageData];
}
#endif
@@ -217,6 +216,7 @@
void NetworkExtensionContentFilter::handleDecision(NEFilterSourceStatus status, NSData *replacementData)
{
+ ASSERT_WITH_SECURITY_IMPLICATION(!replacementData || [replacementData isKindOfClass:[NSData class]]);
m_status = status;
if (status == NEFilterSourceStatusBlock)
m_replacementData = replacementData;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
