foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-12-22 07:14:47 -05:00
Code Issues Packages 1 Wiki Activity

fix: node-api get_value_string_utf8 should use utf8_length (#24193)

Browse source 
whoops. also did a drive-by cleanup of `isolate` usage since i noticed
it while using `utf8_length(isolate)`
This commit is contained in:
snek 2024-06-12 21:39:20 -07:00 committed by GitHub
parent 280f20efd9
commit 8ad25e86da
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
cli/napi/js_native_api.rs
View file

@ -54,7 +54,7 @@ impl Reference {
finalize_data: *mut c_void, finalize_data: *mut c_void,
finalize_hint: *mut c_void, finalize_hint: *mut c_void,
) -> Box<Self> { ) -> Box<Self> {
let isolate = unsafe { &mut *(*env).isolate_ptr }; let isolate = unsafe { (*env).isolate() };
let mut reference = Box::new(Reference { let mut reference = Box::new(Reference {
env, env,
@ -100,7 +100,7 @@ impl Reference {
fn set_strong(&mut self) { fn set_strong(&mut self) {
if let ReferenceState::Weak(w) = &self.state { if let ReferenceState::Weak(w) = &self.state {
let isolate = unsafe { &mut *(*self.env).isolate_ptr }; let isolate = unsafe { (*self.env).isolate() };
if let Some(g) = w.to_global(isolate) { if let Some(g) = w.to_global(isolate) {
self.state = ReferenceState::Strong(g); self.state = ReferenceState::Strong(g);
} }
@ -113,7 +113,7 @@ impl Reference {
let cb = Box::new(move |_: &mut v8::Isolate| { let cb = Box::new(move |_: &mut v8::Isolate| {
Reference::weak_callback(reference) Reference::weak_callback(reference)
}); });
let isolate = unsafe { &mut *(*self.env).isolate_ptr }; let isolate = unsafe { (*self.env).isolate() };
self.state = self.state =
ReferenceState::Weak(v8::Weak::with_finalizer(isolate, g, cb)); ReferenceState::Weak(v8::Weak::with_finalizer(isolate, g, cb));
} }
@ -2105,7 +2105,7 @@ fn napi_get_value_string_utf8(
if buf.is_null() { if buf.is_null() {
check_arg!(env, result); check_arg!(env, result);
unsafe { unsafe {
*result = value.length(); *result = value.utf8_length(env.isolate());
} }
} else if bufsize != 0 { } else if bufsize != 0 {
let buffer = let buffer =
@ -3274,10 +3274,9 @@ fn napi_resolve_deferred(
check_arg!(env, result); check_arg!(env, result);
check_arg!(env, deferred); check_arg!(env, deferred);
let isolate = unsafe { &mut *env.isolate_ptr };
let deferred_ptr = let deferred_ptr =
unsafe { NonNull::new_unchecked(deferred as *mut v8::PromiseResolver) }; unsafe { NonNull::new_unchecked(deferred as *mut v8::PromiseResolver) };
let global = unsafe { v8::Global::from_raw(isolate, deferred_ptr) }; let global = unsafe { v8::Global::from_raw(env.isolate(), deferred_ptr) };
let resolver = v8::Local::new(&mut env.scope(), global); let resolver = v8::Local::new(&mut env.scope(), global);
if !resolver if !resolver
@ -3299,10 +3298,9 @@ fn napi_reject_deferred(
check_arg!(env, result); check_arg!(env, result);
check_arg!(env, deferred); check_arg!(env, deferred);
let isolate = unsafe { &mut *env.isolate_ptr };
let deferred_ptr = let deferred_ptr =
unsafe { NonNull::new_unchecked(deferred as *mut v8::PromiseResolver) }; unsafe { NonNull::new_unchecked(deferred as *mut v8::PromiseResolver) };
let global = unsafe { v8::Global::from_raw(isolate, deferred_ptr) }; let global = unsafe { v8::Global::from_raw(env.isolate(), deferred_ptr) };
let resolver = v8::Local::new(&mut env.scope(), global); let resolver = v8::Local::new(&mut env.scope(), global);
if !resolver if !resolver
@ -3481,11 +3479,10 @@ fn napi_adjust_external_memory(
let env = check_env!(env); let env = check_env!(env);
check_arg!(env, adjusted_value); check_arg!(env, adjusted_value);
let isolate = unsafe { &mut *env.isolate_ptr };
unsafe { unsafe {
*adjusted_value = *adjusted_value = env
isolate.adjust_amount_of_external_allocated_memory(change_in_bytes); .isolate()
.adjust_amount_of_external_allocated_memory(change_in_bytes);
} }
napi_clear_last_error(env) napi_clear_last_error(env)