Fix ObjC callback crash

Author: DjDeveloperr

NativeScript/CMakeLists.txt

@@ -153,6 +153,7 @@ if(ENABLE_JS_RUNTIME)
     runtime/modules/module/ModuleInternal.cpp
     runtime/modules/node/Node.cpp
     runtime/modules/node/FS.cpp
+    runtime/modules/node/Path.cpp
     runtime/modules/performance/Performance.cpp
     runtime/Bundle.mm
     runtime/modules/timers/Timers.mm

NativeScript/ffi/Block.mm

@@ -2,6 +2,7 @@
 #import <Foundation/Foundation.h>
 #include <cstdint>
 #include <cstring>
+#include <mutex>
 #include <unordered_map>
 #include "Interop.h"
 #include "ObjCBridge.h"
@@ -37,11 +38,15 @@
 constexpr int kBlockRefCountOne = (1 << 1);
 constexpr int kBlockHasSignature = (1 << 30);
 std::unordered_map<void*, napi_ref> g_blockToJsFunction;
+std::mutex g_blockToJsFunctionMutex;
 
 void block_copy(void* dest, void* src) {
   auto dst = static_cast<Block_literal_1*>(dest);
   auto source = static_cast<Block_literal_1*>(src);
   dst->closure = source->closure;
+  if (dst->closure != nullptr) {
+    dst->closure->retain();
+  }
 }
 
 void block_release(void* src) {
@@ -51,28 +56,32 @@ void block_release(void* src) {
   }
 
   if (block->closure != nullptr && block->closure->env != nullptr) {
+    std::lock_guard<std::mutex> lock(g_blockToJsFunctionMutex);
     auto it = g_blockToJsFunction.find(block);
     if (it != g_blockToJsFunction.end()) {
-      napi_delete_reference(block->closure->env, it->second);
+      if (std::this_thread::get_id() == block->closure->jsThreadId) {
+        napi_delete_reference(block->closure->env, it->second);
+      }
       g_blockToJsFunction.erase(it);
     }
   }
 
   if (block->closure != nullptr) {
-    delete block->closure;
-    block->closure = nullptr;
+    block->closure->release();
   }
+  block->closure = nullptr;
 }
 
 Block_descriptor_1 kBlockDescriptor = {
     .reserved = 0,
     .size = sizeof(Block_literal_1),
     .copy_helper = block_copy,
     .dispose_helper = block_release,
-    .signature = nullptr,
+    .signature = "v@?",
 };
 
 inline napi_value getCachedBlockJsFunction(napi_env env, void* blockPtr) {
+  std::lock_guard<std::mutex> lock(g_blockToJsFunctionMutex);
   auto it = g_blockToJsFunction.find(blockPtr);
   if (it == g_blockToJsFunction.end()) {
     return nullptr;
@@ -89,6 +98,7 @@ inline void cacheBlockJsFunction(napi_env env, void* blockPtr, napi_value jsFunc
   if (blockPtr == nullptr || jsFunction == nullptr) {
     return;
   }
+  std::lock_guard<std::mutex> lock(g_blockToJsFunctionMutex);
   if (g_blockToJsFunction.find(blockPtr) != g_blockToJsFunction.end()) {
     return;
   }
@@ -104,16 +114,19 @@ void block_finalize(napi_env env, void* data, void* hint) {
     return;
   }
 
-  auto it = g_blockToJsFunction.find(block);
-  if (it != g_blockToJsFunction.end()) {
-    napi_delete_reference(env, it->second);
-    g_blockToJsFunction.erase(it);
+  {
+    std::lock_guard<std::mutex> lock(g_blockToJsFunctionMutex);
+    auto it = g_blockToJsFunction.find(block);
+    if (it != g_blockToJsFunction.end()) {
+      napi_delete_reference(env, it->second);
+      g_blockToJsFunction.erase(it);
+    }
   }
 
   if (block->closure != nullptr) {
-    delete block->closure;
-    block->closure = nullptr;
+    block->closure->release();
   }
+  block->closure = nullptr;
 
   free(block);
 }
@@ -136,7 +149,7 @@ id registerBlock(napi_env env, Closure* closure, napi_value callback) {
   }
 
   block->isa = mallocBlockISA != nullptr ? mallocBlockISA : stackBlockISA;
-  block->flags = kBlockNeedsFree | kBlockHasCopyDispose | kBlockRefCountOne;
+  block->flags = kBlockNeedsFree | kBlockHasCopyDispose | kBlockRefCountOne | kBlockHasSignature;
   block->reserved = 0;
   block->invoke = closure->fnptr;
   block->descriptor = &kBlockDescriptor;

NativeScript/ffi/ClassMember.h

@@ -76,7 +76,8 @@ class ObjCClassMember {
       : bridgeState(bridgeState),
         methodOrGetter(MethodDescriptor(selector, offset)),
         returnOwned((flags & metagen::mdMemberReturnOwned) != 0),
-        classMethod((flags & metagen::mdMemberStatic) != 0) {}
+        classMethod((flags & metagen::mdMemberStatic) != 0),
+        cls(nullptr) {}
 
   ObjCClassMember(ObjCBridgeState* bridgeState, SEL getterSelector,
                   SEL setterSelector, MDSectionOffset getterOffset,
@@ -85,7 +86,8 @@ class ObjCClassMember {
         methodOrGetter(MethodDescriptor(getterSelector, getterOffset)),
         setter(MethodDescriptor(setterSelector, setterOffset)),
         returnOwned((flags & metagen::mdMemberReturnOwned) != 0),
-        classMethod((flags & metagen::mdMemberStatic) != 0) {
+        classMethod((flags & metagen::mdMemberStatic) != 0),
+        cls(nullptr) {
     methodOrGetter.isProperty = true;
     setter.isProperty = true;
   }