Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

script: Avoid double borrow crash on iframe focus (#35742)

Browse source 
Signed-off-by: Seán de Búrca <leftmostcat@gmail.com>
This commit is contained in:
Sean Burke 2025-03-03 02:10:16 -08:00 • committed by GitHub
parent 28cea920ec
commit 649291bf69
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 28 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
components/script/script_thread.rs
View file

@ -2498,10 +2498,18 @@ impl ScriptThread {
.find_document(parent_pipeline_id) .find_document(parent_pipeline_id)
.unwrap(); .unwrap();
let Some(iframe_element_root) = ({
// Enclose `iframes()` call and create a new root to avoid retaining
// borrow.
let iframes = document.iframes(); let iframes = document.iframes();
if let Some(iframe) = iframes.get(browsing_context_id) { iframes
document.request_focus(Some(iframe.element.upcast()), FocusType::Parent, can_gc); .get(browsing_context_id)
} .map(|iframe| DomRoot::from_ref(iframe.element.upcast()))
}) else {
return;
};
document.request_focus(Some(&iframe_element_root), FocusType::Parent, can_gc);
} }
fn handle_post_message_msg( fn handle_post_message_msg(

7
tests/wpt/mozilla/meta/MANIFEST.json vendored
View file

@ -16,6 +16,13 @@
{} {}
] ]
], ],
"iframe_focus-crash.html": [
"f991b1a563f3cc44870640ab194708fa239ad89d",
[
null,
{}
]
],
"test-wait-crash.html": [ "test-wait-crash.html": [
"2419da6af0c278a17b9ff974d4418f9e386ef3e0", "2419da6af0c278a17b9ff974d4418f9e386ef3e0",
[ [

9
tests/wpt/mozilla/tests/mozilla/iframe_focus-crash.html vendored Normal file
View file

@ -0,0 +1,9 @@
<!DOCTYPE html>
<html>
<meta charset="utf-8">
<meta name="assert" content="focusing an iframe with onfocus event shouldn't crash">
<iframe id="f" srcdoc="<iframe></iframe><script>document.querySelector('iframe').focus();</script>"></iframe>
<script>
document.querySelector('iframe').onfocus = () => f;
</script>