From 97c79bbb995b0d2dc1f4af8b972bb6dcea54cddf Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Sun, 9 Aug 2015 17:56:50 +0200 Subject: [PATCH] Avoid a panic when clicking a link whose href is unparsable. --- components/script/dom/htmlanchorelement.rs | 5 ++++- tests/wpt/mozilla/meta/mozilla/follow-hyperlink.html.ini | 3 --- 2 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 tests/wpt/mozilla/meta/mozilla/follow-hyperlink.html.ini diff --git a/components/script/dom/htmlanchorelement.rs b/components/script/dom/htmlanchorelement.rs index 53478dc6aca..b47d799c8ae 100644 --- a/components/script/dom/htmlanchorelement.rs +++ b/components/script/dom/htmlanchorelement.rs @@ -178,7 +178,10 @@ fn follow_hyperlink(subject: &Element, hyperlink_suffix: Option) { // Step 4-5. let document = document_from_node(subject); - let url = UrlParser::new().base_url(&document.url()).parse(&href).unwrap(); + let url = match UrlParser::new().base_url(&document.url()).parse(&href) { + Ok(url) => url, + Err(_) => return, + }; // Step 7. debug!("following hyperlink to {}", url.serialize()); diff --git a/tests/wpt/mozilla/meta/mozilla/follow-hyperlink.html.ini b/tests/wpt/mozilla/meta/mozilla/follow-hyperlink.html.ini deleted file mode 100644 index 8e6e2200a5f..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/follow-hyperlink.html.ini +++ /dev/null @@ -1,3 +0,0 @@ -[follow-hyperlink.html] - type: testharness - expected: CRASH