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

fix(napi): adjust_external_memory in raw_finalize callback

Browse source
This commit is contained in:
LongYinan 2020-12-22 19:43:46 +08:00
parent 28b20b1894
commit bc25a5603b
No known key found for this signature in database
GPG key ID: A3FFE134A3E20881
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
napi/src/env.rs
View file

@ -691,14 +691,12 @@ impl Env {
self.0, self.0,
Box::into_raw(Box::new(TaggedObject::new(native_object))) as *mut c_void, Box::into_raw(Box::new(TaggedObject::new(native_object))) as *mut c_void,
Some(raw_finalize::<T>), Some(raw_finalize::<T>),
ptr::null_mut(), Box::into_raw(Box::new(size_hint)) as *mut c_void,
&mut object_value, &mut object_value,
) )
})?; })?;
if let Some(size_hint) = size_hint { if let Some(changed) = size_hint {
check_status!(unsafe { check_status!(unsafe { sys::napi_adjust_external_memory(self.0, changed, ptr::null_mut()) })?;
sys::napi_adjust_external_memory(self.0, size_hint, ptr::null_mut())
})?;
}; };
Ok(unsafe { JsExternal::from_raw_unchecked(self.0, object_value) }) Ok(unsafe { JsExternal::from_raw_unchecked(self.0, object_value) })
} }
@ -1038,12 +1036,22 @@ unsafe extern "C" fn drop_buffer(
} }
unsafe extern "C" fn raw_finalize<T>( unsafe extern "C" fn raw_finalize<T>(
_raw_env: sys::napi_env, env: sys::napi_env,
finalize_data: *mut c_void, finalize_data: *mut c_void,
_finalize_hint: *mut c_void, finalize_hint: *mut c_void,
) { ) {
let tagged_object = finalize_data as *mut TaggedObject<T>; let tagged_object = finalize_data as *mut TaggedObject<T>;
Box::from_raw(tagged_object); Box::from_raw(tagged_object);
if !finalize_hint.is_null() {
let size_hint = *Box::from_raw(finalize_hint as *mut Option<i64>);
if let Some(changed) = size_hint {
let status = sys::napi_adjust_external_memory(env, -changed, ptr::null_mut());
debug_assert!(
status == sys::Status::napi_ok,
"Calling napi_adjust_external_memory failed"
);
};
}
} }
#[cfg(feature = "napi6")] #[cfg(feature = "napi6")]