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

Fix crash when setting custom property on Location (#36494)

Browse source 
The JS engine uses types like `Handle<Maybe<PropertyDescriptor>>` in
various places and our automated bindings are not able to handle the
Maybe type. We have hand-written bindings that use outparams to indicate
a PropertyDescriptor value is actually the Nothing type, but that data
was getting lost when we passed the property descriptor to
SetPropertyIgnoringNamedGetter, which assumed that the property
descriptor was always valid.

Depends on https://github.com/servo/mozjs/pull/579.

Testing: Manual testing on testcase from
https://github.com/servo/servo/issues/34709, and new crashtest added.
Fixes: #34709

Signed-off-by: Josh Matthews <josh@joshmatthews.net>
This commit is contained in:
Josh Matthews 2025-04-16 02:52:48 -04:00 • committed by GitHub
parent f5e6eb289a
commit 9aa09d73b5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Cargo.lock generated
View file

@ -4673,7 +4673,7 @@ dependencies = [
[[package]] [[package]]
name = "mozjs" name = "mozjs"
version = "0.14.1" version = "0.14.1"
source = "git+https://github.com/servo/mozjs#e4d4f9ac06162fe2647078dc4be8c270b7219807" source = "git+https://github.com/servo/mozjs#d1525dfaee22cc1ea9ee16c552cdeedaa9f20741"
dependencies = [ dependencies = [
"bindgen 0.71.1", "bindgen 0.71.1",
"cc", "cc",
@ -4684,8 +4684,8 @@ dependencies = [
[[package]] [[package]]
name = "mozjs_sys" name = "mozjs_sys"
version = "0.128.9-0" version = "0.128.9-1"
source = "git+https://github.com/servo/mozjs#e4d4f9ac06162fe2647078dc4be8c270b7219807" source = "git+https://github.com/servo/mozjs#d1525dfaee22cc1ea9ee16c552cdeedaa9f20741"
dependencies = [ dependencies = [
"bindgen 0.71.1", "bindgen 0.71.1",
"cc", "cc",

7
components/script_bindings/proxyhandler.rs
View file

@ -565,13 +565,18 @@ pub(crate) unsafe extern "C" fn maybe_cross_origin_set_rawcx<D: DomTypes>(
return false; return false;
} }
let own_desc_handle = own_desc.handle().into();
js::jsapi::SetPropertyIgnoringNamedGetter( js::jsapi::SetPropertyIgnoringNamedGetter(
*cx, *cx,
proxy, proxy,
id, id,
v, v,
receiver, receiver,
own_desc.handle().into(), if is_none {
ptr::null()
} else {
&own_desc_handle
},
result, result,
) )
} }

3
tests/wpt/meta/html/browsers/history/the-location-interface/location-prototype-setting-same-origin-domain.sub.html.ini vendored
View file

@ -1,3 +0,0 @@
[location-prototype-setting-same-origin-domain.sub.html]
[Same-origin-domain: setting the prototype to an empty object via __proto__ should throw a TypeError]
expected: FAIL

3
tests/wpt/meta/html/browsers/history/the-location-interface/location-prototype-setting-same-origin.html.ini vendored
View file

@ -1,3 +0,0 @@
[location-prototype-setting-same-origin.html]
[Same-origin: setting the prototype to an empty object via __proto__ should throw a TypeError]
expected: FAIL

3
tests/wpt/meta/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/no-new-global.window.js.ini vendored
View file

@ -1,6 +1,3 @@
[no-new-global.window.html] [no-new-global.window.html]
[BarProp maintains its prototype and properties through open()] [BarProp maintains its prototype and properties through open()]
expected: FAIL expected: FAIL
[Location maintains its prototype and properties through open()]
expected: FAIL

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

@ -23,6 +23,13 @@
{} {}
] ]
], ],
"location-set-crash.html": [
"0b1695df79b0437fb644bfcb3ef09bc0eb906f1e",
[
null,
{}
]
],
"test-wait-crash.html": [ "test-wait-crash.html": [
"2419da6af0c278a17b9ff974d4418f9e386ef3e0", "2419da6af0c278a17b9ff974d4418f9e386ef3e0",
[ [

5
tests/wpt/mozilla/tests/mozilla/location-set-crash.html vendored Normal file
View file

@ -0,0 +1,5 @@
<html>
<script>
window.location.foo = () => {};
</script>
</html>