fix crash on x86_64

Author: DjDeveloperr

examples/test.js

@@ -6,6 +6,7 @@
 #include "js_native_api_types.h"
 #include "node_api_util.h"
 #import <Foundation/Foundation.h>
+#include <cstring>
 #include <objc/objc.h>
 #include <objc/runtime.h>
 
@@ -25,7 +26,7 @@
   size_t argc = cif->argc;
   napi_get_cb_info(env, cbinfo, &argc, cif->argv, nullptr, nullptr);
 
-  void **avalues = cif->avalues;
+  void *avalues[cif->argc];
   void *rvalue = cif->rvalue;
 
   bool shouldFreeAny = false;
@@ -34,6 +35,7 @@
   if (cif->argc > 0) {
     for (unsigned int i = 0; i < cif->argc; i++) {
       shouldFree[i] = false;
+      avalues[i] = cif->avalues[i];
       cif->argTypes[i]->toNative(env, cif->argv[i], avalues[i], &shouldFree[i],
                                  &shouldFreeAny);
     }
@@ -109,7 +111,7 @@ inline void objcNativeCall(napi_env env, napi_value jsThis, MethodCif *cif,
   size_t argc = cif->argc;
   napi_get_cb_info(env, cbinfo, &argc, cif->argv, &jsThis, nullptr);
 
-  void **avalues = cif->avalues;
+  void *avalues[cif->cif.nargs];
   void *rvalue = cif->rvalue;
 
   avalues[0] = (void *)&self;
@@ -121,10 +123,7 @@ inline void objcNativeCall(napi_env env, napi_value jsThis, MethodCif *cif,
   if (cif->argc > 0) {
     for (unsigned int i = 0; i < cif->argc; i++) {
       shouldFree[i] = false;
-      napi_valuetype type;
-      napi_typeof(env, cif->argv[i], &type);
-      std::string encoding;
-      cif->argTypes[i]->encode(&encoding);
+      avalues[i] = cif->avalues[i + 2];
       cif->argTypes[i]->toNative(env, cif->argv[i], avalues[i + 2],
                                  &shouldFree[i], &shouldFreeAny);
     }
@@ -167,12 +166,9 @@ inline void objcNativeCall(napi_env env, napi_value jsThis, MethodCif *cif,
         method->bridgeData->getMethodCif(env, method->signature);
   }
 
-  void *avalues[2];
+  void *avalues[2] = {&self, &method->selector};
   void *rvalue = cif->rvalue;
 
-  avalues[0] = (void *)&self;
-  avalues[1] = (void *)&method->selector;
-
   objcNativeCall(env, jsThis, cif, self, avalues, rvalue);
 
   if (cif->returnType->kind == mdTypeInstanceObject) {
@@ -205,11 +201,9 @@ inline void objcNativeCall(napi_env env, napi_value jsThis, MethodCif *cif,
         method->bridgeData->getMethodCif(env, method->setterSignature);
   }
 
-  void **avalues = cif->avalues;
+  void *avalues[3] = {&self, &method->setterSelector, cif->avalues[2]};
   void *rvalue = nullptr;
 
-  avalues[0] = (void *)&self;
-  avalues[1] = (void *)&method->setterSelector;
   bool shouldFree = false;
   cif->argTypes[0]->toNative(env, argv, avalues[2], &shouldFree, &shouldFree);
 

src/NativeCall.mm

@@ -269,7 +269,7 @@ void StructObject_finalize(napi_env env, void *data, void *hint) {
 StructObject::StructObject(napi_env env, StructInfo *info, napi_value object,
                            void *memory) {
   this->info = info;
-  NSLog(@"StructObject::StructObject %s, %p, %p", info->name, info, memory);
+
   if (memory == nullptr) {
     this->owned = true;
     this->data = malloc(info->size);
@@ -279,18 +279,15 @@ void StructObject_finalize(napi_env env, void *data, void *hint) {
   }
 
   for (auto &field : info->fields) {
-    NSLog(@"struct field %s", field.name);
     bool hasProp = false;
     napi_has_named_property(env, object, field.name, &hasProp);
-    if (!hasProp)
+    if (!hasProp) {
       continue;
+    }
     napi_value property;
     napi_get_named_property(env, object, field.name, &property);
-    NSLog(@"struct.set %s", field.name);
     set(env, &field, property);
   }
-
-  NSLog(@"struct done");
 }
 
 StructObject::~StructObject() {

src/Struct.mm

@@ -1239,12 +1239,8 @@ void toNative(napi_env env, napi_value value, void *result, bool *shouldFree,
       return;
     }
 
-    NSLog(@"Struct.toNative info: %s, %d", info->name, info->size);
-
     // Serialize directly to previously allocated memory
-    StructObject _(env, info, value, result);
-
-    NSLog(@"Struct.toNative done");
+    StructObject (env, info, value, result);
   }
 };