Fix memory leak in Function::GetScriptOrigin

Author: goffrie

src/binding.cc

@@ -2296,11 +2296,9 @@ int v8__Function__ScriptId(const v8::Function& self) {
   return ptr_to_local(&self)->ScriptId();
 }
 
-const v8::ScriptOrigin* v8__Function__GetScriptOrigin(
-    const v8::Function& self) {
-  std::unique_ptr<v8::ScriptOrigin> u = std::make_unique<v8::ScriptOrigin>(
-      ptr_to_local(&self)->GetScriptOrigin());
-  return u.release();
+void v8__Function__GetScriptOrigin(
+    const v8::Function& self, uninit_t<v8::ScriptOrigin>* out) {
+  construct_in_place<v8::ScriptOrigin>(out, ptr_to_local(&self)->GetScriptOrigin());
 }
 
 const v8::Signature* v8__Signature__New(v8::Isolate* isolate,
@@ -2713,16 +2711,16 @@ void v8__ScriptOrigin__CONSTRUCT(
       ptr_to_local(host_defined_options));
 }
 
-int v8__ScriptOrigin__ScriptId(const v8::ScriptOrigin& self) {
-  return ptr_to_local(&self)->ScriptId();
+int v8__ScriptOrigin__ScriptId(const v8::ScriptOrigin* self) {
+  return self->ScriptId();
 }
 
-const v8::Value* v8__ScriptOrigin__ResourceName(const v8::ScriptOrigin& self) {
-  return local_to_ptr(ptr_to_local(&self)->ResourceName());
+const v8::Value* v8__ScriptOrigin__ResourceName(const v8::ScriptOrigin* self) {
+  return local_to_ptr(self->ResourceName());
 }
 
-const v8::Value* v8__ScriptOrigin__SourceMapUrl(const v8::ScriptOrigin& self) {
-  return local_to_ptr(ptr_to_local(&self)->SourceMapUrl());
+const v8::Value* v8__ScriptOrigin__SourceMapUrl(const v8::ScriptOrigin* self) {
+  return local_to_ptr(self->SourceMapUrl());
 }
 
 const v8::Value* v8__ScriptOrModule__GetResourceName(

src/function.rs

@@ -1,5 +1,6 @@
 use std::convert::TryFrom;
 use std::marker::PhantomData;
+use std::mem::MaybeUninit;
 use std::ptr::NonNull;
 use std::ptr::null;
 
@@ -58,9 +59,10 @@ unsafe extern "C" {
   fn v8__Function__GetScriptColumnNumber(this: *const Function) -> int;
   fn v8__Function__GetScriptLineNumber(this: *const Function) -> int;
   fn v8__Function__ScriptId(this: *const Function) -> int;
-  fn v8__Function__GetScriptOrigin(
+  fn v8__Function__GetScriptOrigin<'a>(
     this: *const Function,
-  ) -> *const ScriptOrigin<'static>;
+    out: *mut MaybeUninit<ScriptOrigin<'a>>,
+  );
 
   fn v8__Function__CreateCodeCache(
     script: *const Function,
@@ -1085,10 +1087,15 @@ impl Function {
   }
 
   #[inline(always)]
-  pub fn get_script_origin(&self) -> &ScriptOrigin<'_> {
+  pub fn get_script_origin<'s>(
+    &self,
+    _scope: &PinScope<'s, '_>,
+  ) -> ScriptOrigin<'s> {
     unsafe {
-      let ptr = v8__Function__GetScriptOrigin(self);
-      &*ptr
+      let mut script_origin: MaybeUninit<ScriptOrigin<'_>> =
+        MaybeUninit::uninit();
+      v8__Function__GetScriptOrigin(self, &mut script_origin);
+      script_origin.assume_init()
     }
   }
 

src/script.rs

@@ -1,4 +1,3 @@
-use std::marker::PhantomData;
 use std::mem::MaybeUninit;
 use std::ptr::null;
 
@@ -16,7 +15,8 @@ use crate::scope::PinScope;
 #[derive(Debug)]
 pub struct ScriptOrigin<'s>(
   [u8; crate::binding::v8__ScriptOrigin_SIZE],
-  PhantomData<&'s ()>,
+  // require pointer alignment
+  [&'s (); 0],
 );
 
 unsafe extern "C" {

tests/test_api.rs

@@ -4153,22 +4153,26 @@ fn function_script_origin_and_id() {
 
     if let Some(id) = prev_id {
       assert_eq!(script_id, id + 1);
-      assert_eq!(script_id, f_function_obj.get_script_origin().script_id(),);
+      assert_eq!(
+        script_id,
+        f_function_obj.get_script_origin(scope).script_id(),
+      );
     }
     prev_id = Some(script_id);
 
     // Verify source map URL matches
     assert_eq!(
       "source_map_url",
       f_function_obj
-        .get_script_origin()
+        .get_script_origin(scope)
         .source_map_url()
         .unwrap()
         .to_rust_string_lossy(scope)
     );
 
     // Verify resource name matches in script origin
-    let resource_name_val = f_function_obj.get_script_origin().resource_name();
+    let resource_name_val =
+      f_function_obj.get_script_origin(scope).resource_name();
     assert!(resource_name_val.is_some());
     assert_eq!(
       resource_name_val.unwrap().to_rust_string_lossy(scope),