Fix pointer allocation handles

Author: DjDeveloperr

NativeScript/ffi/Interop.mm

@@ -970,22 +970,7 @@ napi_value interop_alloc(napi_env env, napi_callback_info info) {
   napi_get_value_int64(env, arg, &size);
 
   void* data = malloc(size);
-
-  napi_value PointerClass = get_ref_value(env, ObjCBridgeState::InstanceData(env)->pointerClass);
-  napi_value result;
-  napi_new_instance(env, PointerClass, 0, nullptr, &result);
-
-  Pointer* ptr = nullptr;
-  napi_unwrap(env, result, (void**)&ptr);
-
-  if (ptr == nullptr) {
-    napi_throw_error(env, nullptr, "Invalid pointer");
-    return nullptr;
-  }
-
-  ptr->data = data;
-
-  return result;
+  return Pointer::create(env, data);
 }
 
 napi_value interop_handleof(napi_env env, napi_callback_info info) {
@@ -1190,20 +1175,15 @@ napi_value interop_bufferFromData(napi_env env, napi_callback_info info) {
 
   ObjCBridgeState* bridgeState = ObjCBridgeState::InstanceData(env);
   napi_value jsPointer = get_ref_value(env, bridgeState->pointerClass);
+  napi_value argv[1];
+  napi_create_bigint_uint64(env, static_cast<uint64_t>(reinterpret_cast<uintptr_t>(data)),
+                            &argv[0]);
   napi_value result;
-  napi_status status = napi_new_instance(env, jsPointer, 0, nullptr, &result);
+  napi_status status = napi_new_instance(env, jsPointer, 1, argv, &result);
 
   if (status != napi_ok) {
     return nullptr;
   }
-
-  Pointer* ptr = Pointer::unwrap(env, result);
-  if (ptr == nullptr) {
-    return nullptr;
-  }
-
-  ptr->data = data;
-  cachePointer(env, data, result);
   return result;
 }
 

TestRunner/app/tests/Marshalling/ReferenceTests.js

@@ -844,23 +844,14 @@ describe(module.id, function () {
             let stringToHash = "bla";
 
             const bytesToAlloc = 32;
-            console.log("[diag][ReferenceAccessor] start");
             const result = interop.alloc(bytesToAlloc);
-            console.log("[diag][ReferenceAccessor] allocated", result.toString());
             CC_SHA256(interop.handleof(NSString.stringWithString(stringToHash).UTF8String), stringToHash.length, result);
-            console.log("[diag][ReferenceAccessor] sha complete");
             let buffer = new interop.Reference(interop.types.uint8, result);
-            console.log("[diag][ReferenceAccessor] buffer ready");
 
             let actual = "";
             for (let i = 0; i < bytesToAlloc; i++) {
                 actual += buffer[i].toString(16).padStart(2, "0");
-                if ((i + 1) % 8 === 0) {
-                    console.log("[diag][ReferenceAccessor] bytes", i + 1, actual);
-                }
             }
-
-            console.log("[diag][ReferenceAccessor] final", actual);
             expect(actual).toBe("4df3c3f68fcc83b27e9d42c90431a72499f17875c81a599b566c9889b9696703");
         });
     });