fix(napi): CString issues

napi-derive/src/lib.rs

@@ -204,7 +204,7 @@ fn get_execute_js_code(
       Err(e) => {
         let message = format!("{}", e);
         unsafe {
-          napi::sys::napi_throw_error(raw_env, ptr::null(), CString::from_vec_unchecked(message.into()).as_ptr() as *const c_char);
+          napi::sys::napi_throw_error(raw_env, ptr::null(), CString::from_vec_unchecked(message.into()).into_raw());
         }
         ptr::null_mut()
       }

napi/src/env.rs

@@ -349,7 +349,7 @@ impl Env {
     check_status(unsafe {
       sys::napi_create_function(
         self.0,
-        name.as_ptr(),
+        name.into_raw(),
         len,
         Some(callback),
         ptr::null_mut(),
@@ -368,11 +368,7 @@ impl Env {
 
   pub fn throw_error(&self, msg: &str) -> Result<()> {
     check_status(unsafe {
-      sys::napi_throw_error(
-        self.0,
-        ptr::null(),
-        CString::from_vec_unchecked(msg.into()).as_ptr() as *const _,
-      )
+      sys::napi_throw_error(self.0, ptr::null(), CString::new(msg)?.into_raw())
     })
   }
 

napi/src/js_values/mod.rs

@@ -257,9 +257,9 @@ macro_rules! impl_object_methods {
       where
         T: NapiValue,
       {
-        let key = CString::new(name.to_owned())?;
+        let key = CString::new(name)?;
         check_status(unsafe {
-          sys::napi_set_named_property(self.0.env, self.0.value, key.as_ptr(), value.raw())
+          sys::napi_set_named_property(self.0.env, self.0.value, key.into_raw(), value.raw())
         })
       }
       pub fn get_named_property<T>(&self, name: &str) -> Result<T>
@@ -269,7 +269,7 @@ macro_rules! impl_object_methods {
         let key = CString::new(name)?;
         let mut raw_value = ptr::null_mut();
         check_status(unsafe {
-          sys::napi_get_named_property(self.0.env, self.0.value, key.as_ptr(), &mut raw_value)
+          sys::napi_get_named_property(self.0.env, self.0.value, key.into_raw(), &mut raw_value)
         })?;
         T::from_raw(self.0.env, raw_value)
       }
@@ -280,7 +280,7 @@ macro_rules! impl_object_methods {
         let mut result = false;
         let key = CString::new(name.as_ref())?;
         check_status(unsafe {
-          sys::napi_has_named_property(self.0.env, self.0.value, key.as_ptr(), &mut result)
+          sys::napi_has_named_property(self.0.env, self.0.value, key.into_raw(), &mut result)
         })?;
         Ok(result)
       }
@@ -299,7 +299,7 @@ macro_rules! impl_object_methods {
         let key_str = CString::new(name)?;
         let mut js_key = ptr::null_mut();
         check_status(unsafe {
-          sys::napi_create_string_utf8(self.0.env, key_str.as_ptr(), name.len() as _, &mut js_key)
+          sys::napi_create_string_utf8(self.0.env, key_str.into_raw(), name.len(), &mut js_key)
         })?;
         check_status(unsafe {
           sys::napi_delete_property(self.0.env, self.0.value, js_key, &mut result)
@@ -311,7 +311,7 @@ macro_rules! impl_object_methods {
         let string = CString::new(key)?;
         let mut js_key = ptr::null_mut();
         check_status(unsafe {
-          sys::napi_create_string_utf8(self.0.env, string.as_ptr(), key.len() as _, &mut js_key)
+          sys::napi_create_string_utf8(self.0.env, string.into_raw(), key.len(), &mut js_key)
         })?;
         check_status(unsafe {
           sys::napi_has_own_property(self.0.env, self.0.value, js_key, &mut result)
@@ -333,7 +333,7 @@ macro_rules! impl_object_methods {
         let mut js_key = ptr::null_mut();
         let mut result = false;
         check_status(unsafe {
-          sys::napi_create_string_utf8(self.0.env, string.as_ptr(), name.len() as _, &mut js_key)
+          sys::napi_create_string_utf8(self.0.env, string.into_raw(), name.len(), &mut js_key)
         })?;
         check_status(unsafe {
           sys::napi_has_property(self.0.env, self.0.value, js_key, &mut result)

napi/src/js_values/object_property.rs

@@ -37,7 +37,7 @@ impl<'env> Property<'env> {
     let string_value = CString::new(name)?;
     let mut result = ptr::null_mut();
     check_status(unsafe {
-      sys::napi_create_string_utf8(env.0, string_value.as_ptr(), name.len() as _, &mut result)
+      sys::napi_create_string_utf8(env.0, string_value.into_raw(), name.len(), &mut result)
     })?;
     Ok(Property {
       name,

napi/src/lib.rs

@@ -188,7 +188,7 @@ macro_rules! register_module {
               raw_env,
               ptr::null(),
               CString::from_vec_unchecked(format!("Error initializing module: {}", e).into())
-                .as_ptr() as *const _,
+                .into_raw() as *const _,
             )
           };
           ptr::null_mut()