From 8c0a566860cf0f43662dc9d6c3474ae194c1a9fc Mon Sep 17 00:00:00 2001 From: Taym Haddadi Date: Mon, 9 Sep 2024 17:09:06 +0200 Subject: Fix devtool crashs after entering window.location in console (#33381) Signed-off-by: Taym --- components/script/script_thread.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'components/script/script_thread.rs') diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs index a7c91cc9a49..9677c371ff3 100644 --- a/components/script/script_thread.rs +++ b/components/script/script_thread.rs @@ -113,6 +113,7 @@ use crate::dom::bindings::reflector::DomObject; use crate::dom::bindings::root::{ Dom, DomRoot, MutNullableDom, RootCollection, ThreadLocalStackRoots, }; +use crate::dom::bindings::settings_stack::AutoEntryScript; use crate::dom::bindings::str::DOMString; use crate::dom::bindings::trace::{HashMapTracedValues, JSTraceable}; use crate::dom::customelementregistry::{ @@ -2518,7 +2519,11 @@ impl ScriptThread { let documents = self.documents.borrow(); match msg { DevtoolScriptControlMsg::EvaluateJS(id, s, reply) => match documents.find_window(id) { - Some(window) => devtools::handle_evaluate_js(window.upcast(), s, reply), + Some(window) => { + let global = window.upcast::(); + let _aes = AutoEntryScript::new(&global); + devtools::handle_evaluate_js(&global, s, reply) + }, None => warn!("Message sent to closed pipeline {}.", id), }, DevtoolScriptControlMsg::GetRootNode(id, reply) => { -- cgit v1.2.3