diff --git a/crates/oxide_types/src/value.rs b/crates/oxide_types/src/value.rs index 8e71858..2565f91 100644 --- a/crates/oxide_types/src/value.rs +++ b/crates/oxide_types/src/value.rs @@ -171,17 +171,23 @@ impl JsValue { } pub fn as_ptr(&self) -> *const u8 { - debug_assert!(self.is_object(), "JsValue is not an object"); + if !self.is_object() { + return std::ptr::null(); + } (self.0 & PTR_MASK) as *const u8 } pub fn as_object_ptr(&self) -> *mut u8 { - debug_assert!(self.is_object(), "JsValue is not an object"); + if !self.is_object() { + return std::ptr::null_mut(); + } (self.0 & PTR_MASK) as *mut u8 } pub fn as_js_object_ptr(&self) -> *mut JsObject { - debug_assert!(self.is_object(), "JsValue is not an object"); + if !self.is_object() { + return std::ptr::null_mut(); + } (self.0 & PTR_MASK) as *mut JsObject } diff --git a/crates/oxide_vm/tests/value_tests.rs b/crates/oxide_vm/tests/value_tests.rs index 91ade95..fbb6877 100644 --- a/crates/oxide_vm/tests/value_tests.rs +++ b/crates/oxide_vm/tests/value_tests.rs @@ -91,6 +91,39 @@ fn object_pointer_roundtrip() { assert_eq!(ptr, &x as *const u8); } +#[test] +fn as_ptr_non_object_returns_null() { + assert!(JsValue::int(0).as_ptr().is_null()); + assert!(JsValue::float(0.0).as_ptr().is_null()); + assert!(JsValue::bool(true).as_ptr().is_null()); + assert!(JsValue::null().as_ptr().is_null()); + assert!(JsValue::undefined().as_ptr().is_null()); + let x = 42u8; + assert!(!JsValue::object(&x as *const u8).as_ptr().is_null()); +} + +#[test] +fn as_object_ptr_non_object_returns_null() { + assert!(JsValue::int(0).as_object_ptr().is_null()); + assert!(JsValue::float(0.0).as_object_ptr().is_null()); + assert!(JsValue::bool(true).as_object_ptr().is_null()); + assert!(JsValue::null().as_object_ptr().is_null()); + assert!(JsValue::undefined().as_object_ptr().is_null()); + let x = 42u8; + assert!(!JsValue::object(&x as *const u8).as_object_ptr().is_null()); +} + +#[test] +fn as_js_object_ptr_non_object_returns_null() { + assert!(JsValue::int(0).as_js_object_ptr().is_null()); + assert!(JsValue::float(0.0).as_js_object_ptr().is_null()); + assert!(JsValue::bool(true).as_js_object_ptr().is_null()); + assert!(JsValue::null().as_js_object_ptr().is_null()); + assert!(JsValue::undefined().as_js_object_ptr().is_null()); + let x = 42u8; + assert!(!JsValue::object(&x as *const u8).as_js_object_ptr().is_null()); +} + #[test] fn display_int() { assert_eq!(format!("{}", JsValue::int(42)), "42");