Title: [131618] trunk
- Revision
- 131618
- Author
- [email protected]
- Date
- 2012-10-17 10:17:06 -0700 (Wed, 17 Oct 2012)
Log Message
xss-DENIED-xsl-document-securityOrigin.xml crashes with icon assertion
https://bugs.webkit.org/show_bug.cgi?id=99571
Patch by Christophe Dumez <[email protected]> on 2012-10-17
Reviewed by Kenneth Rohde Christiansen.
Source/WebCore:
Check that the iconURL is not empty in IconController::continueLoadWithDecision()
to avoid hitting assertions later when trying to commit this empty URL to the
database. IconController::url() may indeed return an empty URL but there was
no check for it.
No new tests, already covered by http/tests/security/xss-DENIED-xsl-document-securityOrigin.xml.
* loader/icon/IconController.cpp:
(WebCore::IconController::continueLoadWithDecision):
LayoutTests:
Unskip http/tests/security/xss-DENIED-xsl-document-securityOrigin.xml
for EFL WebKit2 now that it no longer hits an assertion in
IconDatabase.
* platform/efl-wk2/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (131617 => 131618)
--- trunk/LayoutTests/ChangeLog 2012-10-17 17:15:14 UTC (rev 131617)
+++ trunk/LayoutTests/ChangeLog 2012-10-17 17:17:06 UTC (rev 131618)
@@ -1,3 +1,16 @@
+2012-10-17 Christophe Dumez <[email protected]>
+
+ xss-DENIED-xsl-document-securityOrigin.xml crashes with icon assertion
+ https://bugs.webkit.org/show_bug.cgi?id=99571
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Unskip http/tests/security/xss-DENIED-xsl-document-securityOrigin.xml
+ for EFL WebKit2 now that it no longer hits an assertion in
+ IconDatabase.
+
+ * platform/efl-wk2/TestExpectations:
+
2012-10-17 Shinya Kawanaka <[email protected]>
Dynamically added elements do not get re-projected.
Modified: trunk/LayoutTests/platform/efl-wk2/TestExpectations (131617 => 131618)
--- trunk/LayoutTests/platform/efl-wk2/TestExpectations 2012-10-17 17:15:14 UTC (rev 131617)
+++ trunk/LayoutTests/platform/efl-wk2/TestExpectations 2012-10-17 17:17:06 UTC (rev 131618)
@@ -49,8 +49,6 @@
Bug(EFL) fast/dom/HTMLAnchorElement/anchor-download.html [ Crash ]
Bug(EFL) fast/dom/HTMLAnchorElement/anchor-nodownload-set.html [ Crash ]
-webkit.org/b/99571 http/tests/security/xss-DENIED-xsl-document-securityOrigin.xml [ Crash ]
-
#////////////////////////////////////////////////////////////////////////////////////////
# FLAKY TESTS
#////////////////////////////////////////////////////////////////////////////////////////
Modified: trunk/Source/WebCore/ChangeLog (131617 => 131618)
--- trunk/Source/WebCore/ChangeLog 2012-10-17 17:15:14 UTC (rev 131617)
+++ trunk/Source/WebCore/ChangeLog 2012-10-17 17:17:06 UTC (rev 131618)
@@ -1,3 +1,20 @@
+2012-10-17 Christophe Dumez <[email protected]>
+
+ xss-DENIED-xsl-document-securityOrigin.xml crashes with icon assertion
+ https://bugs.webkit.org/show_bug.cgi?id=99571
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Check that the iconURL is not empty in IconController::continueLoadWithDecision()
+ to avoid hitting assertions later when trying to commit this empty URL to the
+ database. IconController::url() may indeed return an empty URL but there was
+ no check for it.
+
+ No new tests, already covered by http/tests/security/xss-DENIED-xsl-document-securityOrigin.xml.
+
+ * loader/icon/IconController.cpp:
+ (WebCore::IconController::continueLoadWithDecision):
+
2012-10-17 Byungwoo Lee <[email protected]>
Fix build warnings : -Wunused-parameter, -Wunused-variable
Modified: trunk/Source/WebCore/loader/icon/IconController.cpp (131617 => 131618)
--- trunk/Source/WebCore/loader/icon/IconController.cpp 2012-10-17 17:15:14 UTC (rev 131617)
+++ trunk/Source/WebCore/loader/icon/IconController.cpp 2012-10-17 17:17:06 UTC (rev 131618)
@@ -213,6 +213,8 @@
if (iconLoadDecision == IconLoadNo) {
KURL iconURL(url());
String urlString(iconURL.string());
+ if (urlString.isEmpty())
+ return;
LOG(IconDatabase, "IconController::startLoader() - Told not to load this icon, committing iconURL %s to database for pageURL mapping", urlString.ascii().data());
commitToDatabase(iconURL);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
