From 458795d4859e16e407ab91d6d2f5b1a9be942db4 Mon Sep 17 00:00:00 2001 From: krk Date: Wed, 10 Apr 2019 22:10:59 +0200 Subject: [PATCH 1/2] Do not unwrap empty unminified_js_dir in HTMLScriptElement.unminify_js. --- components/script/dom/htmlscriptelement.rs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs index 1aa2e6fa1f5..3ab9d7b4c0e 100644 --- a/components/script/dom/htmlscriptelement.rs +++ b/components/script/dom/htmlscriptelement.rs @@ -556,7 +556,15 @@ impl HTMLScriptElement { }, } - let path = PathBuf::from(window_from_node(self).unminified_js_dir().unwrap()); + let path; + match window_from_node(self).unminified_js_dir() { + Some(unminified_js_dir) => path = PathBuf::from(unminified_js_dir), + None => { + warn!("Could not store script directory not found"); + return; + }, + } + let path = if script.external { // External script. let path_parts = script.url.path_segments().unwrap(); From 73cb8b9ea6baba38c8a815b93c390c6f0df84c41 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Tue, 16 Apr 2019 11:17:53 -0400 Subject: [PATCH 2/2] Clarify warning. --- components/script/dom/htmlscriptelement.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs index 3ab9d7b4c0e..9eb8c1751c2 100644 --- a/components/script/dom/htmlscriptelement.rs +++ b/components/script/dom/htmlscriptelement.rs @@ -560,7 +560,7 @@ impl HTMLScriptElement { match window_from_node(self).unminified_js_dir() { Some(unminified_js_dir) => path = PathBuf::from(unminified_js_dir), None => { - warn!("Could not store script directory not found"); + warn!("Unminified script directory not found"); return; }, }