Handle the for and event attributes on a script element correctly when one of them is present (fixes #5258).

1 files changed, 14 insertions, 13 deletions

diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs
index 637cb23ee2f..8dca04ec736 100644
--- a/components/script/dom/htmlscriptelement.rs
+++ b/components/script/dom/htmlscriptelement.rs
@@ -202,25 +202,26 @@ impl<'a> HTMLScriptElementHelpers for JSRef<'a, HTMLScriptElement> {
         }
 
         // Step 12.
-        match element.get_attribute(ns!(""), &atom!("for")).root() {
-            Some(for_script) => {
-                if for_script.r().Value().to_ascii_lowercase().trim_matches(HTML_SPACE_CHARACTERS) != "window" {
+        let for_attribute = element.get_attribute(ns!(""), &atom!("for")).root();
+        let event_attribute = element.get_attribute(ns!(""), &Atom::from_slice("event")).root();
+        match (for_attribute.r(), event_attribute.r()) {
+            (Some(for_attribute), Some(event_attribute)) => {
+                let for_value = for_attribute.Value()
+                                             .to_ascii_lowercase();
+                let for_value = for_value.trim_matches(HTML_SPACE_CHARACTERS);
+                if for_value != "window" {
                     return;
                 }
-            }
-            _ => { }
-        }
 
-        match element.get_attribute(ns!(""), &Atom::from_slice("event")).root() {
-            Some(event) => {
-                let event = event.r().Value().to_ascii_lowercase();
-                let event = event.trim_matches(HTML_SPACE_CHARACTERS);
-                if event != "onload" && event != "onload()" {
+                let event_value = event_attribute.Value().to_ascii_lowercase();
+                let event_value = event_value.trim_matches(HTML_SPACE_CHARACTERS);
+                if event_value != "onload" && event_value != "onload()" {
                     return;
                 }
-            }
-            _ => { }
+            },
+            (_, _) => (),
         }
+
         // Step 13.
         if let Some(charset) = element.get_attribute(ns!(""), &Atom::from_slice("charset")).root() {
             if let Some(encodingRef) = encoding_from_whatwg_label(&charset.r().Value()) {