diff options
| author | Andriy Sultanov <53952748+last-genius@users.noreply.github.com> | 2024-09-05 04:25:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-05 03:25:49 +0000 |
| commit | aadc212b95cdef2a25475f025aa7fab659dde646 (patch) | |
| tree | e3123db81d75a67f75e3e84934fd069cdeb7ad01 /components/script/devtools.rs | |
| parent | 642c25d9a73b2c3fbe6f98a32bae5c7bdb6c448f (diff) | |
| download | servo-aadc212b95cdef2a25475f025aa7fab659dde646.tar.gz servo-aadc212b95cdef2a25475f025aa7fab659dde646.zip | |
jsstring_to_str should accept a NonNull argument for the JS string (#33306)
Instead of asserting the raw pointer is not null, force callers to
produce a NonNull pointer.
Signed-off-by: Andriy Sultanov <sultanovandriy@gmail.com>
Diffstat (limited to 'components/script/devtools.rs')
| -rw-r--r-- | components/script/devtools.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/components/script/devtools.rs b/components/script/devtools.rs index dacb98683c9..5e68b2d198e 100644 --- a/components/script/devtools.rs +++ b/components/script/devtools.rs @@ -71,13 +71,14 @@ pub fn handle_evaluate_js(global: &GlobalScope, eval: String, reply: IpcSender<E }, ) } else if rval.is_string() { - EvaluateJSReply::StringValue(String::from(jsstring_to_str(*cx, rval.to_string()))) + let jsstr = std::ptr::NonNull::new(rval.to_string()).unwrap(); + EvaluateJSReply::StringValue(String::from(jsstring_to_str(*cx, jsstr))) } else if rval.is_null() { EvaluateJSReply::NullValue } else { assert!(rval.is_object()); - let jsstr = ToString(*cx, rval.handle()); + let jsstr = std::ptr::NonNull::new(ToString(*cx, rval.handle())).unwrap(); let class_name = jsstring_to_str(*cx, jsstr); EvaluateJSReply::ActorValue { |