Title: [181409] trunk
- Revision
- 181409
- Author
- [email protected]
- Date
- 2015-03-11 15:02:01 -0700 (Wed, 11 Mar 2015)
Log Message
REGRESSION (r180985): contentfiltering/block-after-add-data.html crashes with GuardMalloc
https://bugs.webkit.org/show_bug.cgi?id=142526
Reviewed by Darin Adler.
Source/WebCore:
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::dataReceived): Don't delete m_contentFilter until after we're done using its replacement data.
LayoutTests:
* TestExpectations: Un-skipped contentfiltering/block-after-add-data.html.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (181408 => 181409)
--- trunk/LayoutTests/ChangeLog 2015-03-11 22:01:01 UTC (rev 181408)
+++ trunk/LayoutTests/ChangeLog 2015-03-11 22:02:01 UTC (rev 181409)
@@ -1,3 +1,12 @@
+2015-03-10 Andy Estes <[email protected]>
+
+ REGRESSION (r180985): contentfiltering/block-after-add-data.html crashes with GuardMalloc
+ https://bugs.webkit.org/show_bug.cgi?id=142526
+
+ Reviewed by Darin Adler.
+
+ * TestExpectations: Un-skipped contentfiltering/block-after-add-data.html.
+
2015-03-10 Sam Weinig <[email protected]>
Allow adding a button in input elements for auto fill related functionality
Modified: trunk/LayoutTests/TestExpectations (181408 => 181409)
--- trunk/LayoutTests/TestExpectations 2015-03-11 22:01:01 UTC (rev 181408)
+++ trunk/LayoutTests/TestExpectations 2015-03-11 22:02:01 UTC (rev 181409)
@@ -491,8 +491,6 @@
# Content extensions are Mac-WK2-only for now
http/tests/contentextensions [ Skip ]
-webkit.org/b/142526 contentfiltering/block-after-add-data.html [ Skip ]
-
# These tests were flaky on Mac only but they became flaky on all ports after r181345
webkit.org/b/114280 svg/animations/smil-leak-dynamically-added-element-instances.svg [ Pass Failure ]
webkit.org/b/114280 svg/animations/smil-leak-element-instances-noBaseValRef.svg [ Pass Failure ]
Modified: trunk/Source/WebCore/ChangeLog (181408 => 181409)
--- trunk/Source/WebCore/ChangeLog 2015-03-11 22:01:01 UTC (rev 181408)
+++ trunk/Source/WebCore/ChangeLog 2015-03-11 22:02:01 UTC (rev 181409)
@@ -1,3 +1,13 @@
+2015-03-10 Andy Estes <[email protected]>
+
+ REGRESSION (r180985): contentfiltering/block-after-add-data.html crashes with GuardMalloc
+ https://bugs.webkit.org/show_bug.cgi?id=142526
+
+ Reviewed by Darin Adler.
+
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::dataReceived): Don't delete m_contentFilter until after we're done using its replacement data.
+
2015-03-10 Sam Weinig <[email protected]>
Allow adding a button in input elements for auto fill related functionality
Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (181408 => 181409)
--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2015-03-11 22:01:01 UTC (rev 181408)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2015-03-11 22:02:01 UTC (rev 181409)
@@ -875,10 +875,8 @@
data = ""
loadWasBlockedBeforeFinishing = m_contentFilter->didBlockData();
- if (loadWasBlockedBeforeFinishing) {
+ if (loadWasBlockedBeforeFinishing)
frameLoader()->client().contentFilterDidBlockLoad(m_contentFilter->unblockHandler());
- m_contentFilter = nullptr;
- }
}
#endif
@@ -892,8 +890,10 @@
commitLoad(data, length);
#if ENABLE(CONTENT_FILTERING)
- if (loadWasBlockedBeforeFinishing)
+ if (loadWasBlockedBeforeFinishing) {
cancelMainResourceLoad(frameLoader()->cancelledError(m_request));
+ m_contentFilter = nullptr;
+ }
#endif
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
