naskya/napi-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #510 from napi-rs/fix-object-finalizer

Browse source 
fix(napi): finalizer maybe_ref pointer value
This commit is contained in:
LongYinan 2021-03-19 15:48:06 +08:00 committed by GitHub
commit 69b8773350
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
napi/src/js_values/object.rs
View file

@ -40,11 +40,12 @@ impl JsObject {
F: FnOnce(FinalizeContext<T, Hint>), F: FnOnce(FinalizeContext<T, Hint>),
{ {
let mut maybe_ref = ptr::null_mut(); let mut maybe_ref = ptr::null_mut();
let wrap_context = Box::leak(Box::new((native, finalize_cb, ptr::null_mut())));
check_status!(unsafe { check_status!(unsafe {
sys::napi_add_finalizer( sys::napi_add_finalizer(
self.0.env, self.0.env,
self.0.value, self.0.value,
Box::leak(Box::new((native, finalize_cb, maybe_ref))) as *mut _ as *mut c_void, wrap_context as *mut _ as *mut c_void,
Some( Some(
finalize_callback::<T, Hint, F> finalize_callback::<T, Hint, F>
as unsafe extern "C" fn( as unsafe extern "C" fn(
@ -56,7 +57,9 @@ impl JsObject {
Box::leak(Box::new(finalize_hint)) as *mut _ as *mut c_void, Box::leak(Box::new(finalize_hint)) as *mut _ as *mut c_void,
&mut maybe_ref, // Note: this does not point to the boxed one… &mut maybe_ref, // Note: this does not point to the boxed one…
) )
}) })?;
wrap_context.2 = maybe_ref;
Ok(())
} }
} }
@ -75,7 +78,6 @@ unsafe extern "C" fn finalize_callback<T, Hint, F>(
let env = Env::from_raw(raw_env); let env = Env::from_raw(raw_env);
callback(FinalizeContext { value, hint, env }); callback(FinalizeContext { value, hint, env });
if !raw_ref.is_null() { if !raw_ref.is_null() {
// … ⬆️ this branch is thus unreachable.
let status = sys::napi_delete_reference(raw_env, raw_ref); let status = sys::napi_delete_reference(raw_env, raw_ref);
debug_assert!( debug_assert!(
status == sys::Status::napi_ok, status == sys::Status::napi_ok,