Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 21:20:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Handle failed string conversions in console.log. (#33085)

Browse source 
Signed-off-by: Josh Matthews <josh@joshmatthews.net>
This commit is contained in:
Josh Matthews 2024-08-16 12:49:56 -04:00 • committed by GitHub
parent 4df7a1af25
commit 3829e91662
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
components/script/dom/bindings/conversions.rs
View file

@ -221,6 +221,7 @@ impl FromJSValConvertible for DOMString {
/// Convert the given `JSString` to a `DOMString`. Fails if the string does not /// Convert the given `JSString` to a `DOMString`. Fails if the string does not
/// contain valid UTF-16. /// contain valid UTF-16.
pub unsafe fn jsstring_to_str(cx: *mut JSContext, s: *mut JSString) -> DOMString { pub unsafe fn jsstring_to_str(cx: *mut JSContext, s: *mut JSString) -> DOMString {
assert!(!s.is_null());
let latin1 = JS_DeprecatedStringHasLatin1Chars(s); let latin1 = JS_DeprecatedStringHasLatin1Chars(s);
DOMString::from_string(if latin1 { DOMString::from_string(if latin1 {
latin1_to_string(cx, s) latin1_to_string(cx, s)

3
components/script/dom/console.rs
View file

@ -73,6 +73,9 @@ where
unsafe fn handle_value_to_string(cx: *mut jsapi::JSContext, value: HandleValue) -> DOMString { unsafe fn handle_value_to_string(cx: *mut jsapi::JSContext, value: HandleValue) -> DOMString {
rooted!(in(cx) let mut js_string = std::ptr::null_mut::<jsapi::JSString>()); rooted!(in(cx) let mut js_string = std::ptr::null_mut::<jsapi::JSString>());
js_string.set(JS_ValueToSource(cx, value)); js_string.set(JS_ValueToSource(cx, value));
if js_string.is_null() {
return "<error converting value to string>".into();
}
jsstring_to_str(cx, *js_string) jsstring_to_str(cx, *js_string)
} }