use safe variant in tests

Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>

Author: sagudev

mozjs/benches/latin1_string_conversion.rs

@@ -3,7 +3,7 @@ use criterion::{
     criterion_group, criterion_main, BenchmarkGroup, BenchmarkId, Criterion, Throughput,
 };
 use mozjs::context::JSContext;
-use mozjs::conversions::jsstr_to_string;
+use mozjs::conversions::jsstr_to_string_safe;
 use mozjs::glue::{CreateJSExternalStringCallbacks, JSExternalStringCallbacksTraps};
 use mozjs::jsapi::OnNewGlobalHookOption;
 use mozjs::realm::AutoRealm;
@@ -52,9 +52,7 @@ fn bench_str_repetition(
             &latin1_jsstr,
             |b, js_str| {
                 b.iter(|| {
-                    unsafe {
-                        jsstr_to_string(context.raw_cx(), NonNull::new(js_str.get()).unwrap())
-                    };
+                    jsstr_to_string_safe(context, NonNull::new(js_str.get()).unwrap());
                 })
             },
         );

mozjs/tests/external_string.rs

@@ -8,7 +8,7 @@ use std::ptr::NonNull;
 
 #[cfg(test)]
 use mozjs::context::JSContext;
-use mozjs::conversions::jsstr_to_string;
+use mozjs::conversions::jsstr_to_string_safe;
 use mozjs::glue::{CreateJSExternalStringCallbacks, JSExternalStringCallbacksTraps};
 use mozjs::jsapi::OnNewGlobalHookOption;
 use mozjs::realm::AutoRealm;
@@ -100,7 +100,7 @@ fn external_string() {
             callbacks
         ));
         assert_eq!(
-            jsstr_to_string(context.raw_cx(), NonNull::new(utf16_jsstr.get()).unwrap()),
+            jsstr_to_string_safe(context, NonNull::new(utf16_jsstr.get()).unwrap()),
             utf16_base
         );
     }
@@ -122,7 +122,7 @@ unsafe fn test_latin1_string(context: &mut JSContext, latin1_base: &str) {
         callbacks
     ));
     assert_eq!(
-        jsstr_to_string(context.raw_cx(), NonNull::new(latin1_jsstr.get()).unwrap()),
+        jsstr_to_string_safe(context, NonNull::new(latin1_jsstr.get()).unwrap()),
         latin1_base
     );
 }
@@ -143,7 +143,7 @@ unsafe fn test_latin1_string_bytes(context: &mut JSContext, latin1_base: &[u8])
         callbacks
     ));
     assert_eq!(
-        jsstr_to_string(context.raw_cx(), NonNull::new(latin1_jsstr.get()).unwrap()),
+        jsstr_to_string_safe(context, NonNull::new(latin1_jsstr.get()).unwrap()),
         encoding_rs::mem::decode_latin1(latin1_base)
     );
 }

mozjs/tests/stack_gc_vector.rs

@@ -5,7 +5,7 @@
 use std::ptr::{self, NonNull};
 use std::sync::{LazyLock, Mutex};
 
-use mozjs::conversions::jsstr_to_string;
+use mozjs::conversions::jsstr_to_string_safe;
 use mozjs::gc::StackGCVector;
 use mozjs::jsapi::{
     CompilationType, Handle, HandleString, HandleValue, JSContext, JSSecurityCallbacks, JSString,
@@ -34,29 +34,32 @@ unsafe extern "C" fn content_security_policy_allows(
     _body_arg: HandleValue,
     can_compile_strings: *mut bool,
 ) -> bool {
+    // SAFETY: We are in SM hook
+    let mut cx = unsafe { mozjs::context::JSContext::from_ptr(NonNull::new(cx).unwrap()) };
+    let cx = &mut cx;
     let parameter_strings = SafeHandle::from_raw(parameter_strings);
     assert_eq!(parameter_strings.len(), 2);
 
     let string0 = parameter_strings.at(0).expect("should have a value");
     let string0 = NonNull::new(*string0).expect("should be non-null");
-    assert_eq!(jsstr_to_string(cx, string0), "a".to_string());
+    assert_eq!(jsstr_to_string_safe(cx, string0), "a".to_string());
 
     let string1 = parameter_strings.at(1).expect("should have a value");
     let string1 = NonNull::new(*string1).expect("should be non-null");
-    assert_eq!(jsstr_to_string(cx, string1), "b".to_string());
+    assert_eq!(jsstr_to_string_safe(cx, string1), "b".to_string());
 
     let parameter_args = SafeHandle::from_raw(parameter_args);
     assert_eq!(parameter_args.len(), 2);
 
     let arg0 = parameter_args.at(0).expect("should have a value");
     let string0 = arg0.to_string();
     let string0 = NonNull::new(string0).expect("should be non-null");
-    assert_eq!(jsstr_to_string(cx, string0), "a".to_string());
+    assert_eq!(jsstr_to_string_safe(cx, string0), "a".to_string());
 
     let arg1 = parameter_args.at(1).expect("should have a value");
     let string1 = arg1.to_string();
     let string1 = NonNull::new(string1).expect("should be non-null");
-    assert_eq!(jsstr_to_string(cx, string1), "b".to_string());
+    assert_eq!(jsstr_to_string_safe(cx, string1), "b".to_string());
 
     *RAN_CSP_CALLBACK.lock().unwrap() = true;
     *can_compile_strings = true;