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

fix(napi): napi_create_async_work incorrect argument (napi-rs#1392) (#1396)

Browse source 
The third argument to `napi_create_async_work` (async_resource_name)
should be a `napi_value` that corresponds to a null-terminated utf-8
string.

This resolves errors running Next.js with GraalVM.

oracle/graal#5582
oracle/graal#5581
This commit is contained in:
Patrick Pilch 2022-12-15 23:59:15 -06:00 committed by GitHub
parent 6ad1740dac
commit 486ce35c82
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
crates/napi/src/async_work.rs
View file

@ -1,4 +1,4 @@
use std::ffi::CStr;
use std::ffi::CString;
use std::mem;
use std::os::raw::c_void;
use std::ptr;
@ -60,12 +60,18 @@ pub fn run<T: Task>(
napi_async_work: ptr::null_mut(),
status: task_status.clone(),
}));
let async_work_name = unsafe { CStr::from_bytes_with_nul_unchecked(b"napi_rs_async_work\0") };
let mut async_work_name = ptr::null_mut();
let s = "napi_rs_async_work";
let len = s.len();
let s = CString::new(s)?;
check_status!(unsafe {
sys::napi_create_string_utf8(env, s.as_ptr(), len, &mut async_work_name)
})?;
check_status!(unsafe {
sys::napi_create_async_work(
env,
raw_resource,
async_work_name.as_ptr() as *mut _,
async_work_name,
Some(execute::<T> as unsafe extern "C" fn(env: sys::napi_env, data: *mut c_void)),
Some(
complete::<T>