fix: Fix OwningRef/BorrowingRef empty copy constructo

mrousavy · Jan 15, 2025 · 224925f · 224925f
1 parent 3a2ea44
commit 224925f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/packages/react-native-nitro-modules/cpp/utils/BorrowingReference.hpp b/packages/react-native-nitro-modules/cpp/utils/BorrowingReference.hpp
@@ -32,8 +32,10 @@ class BorrowingReference final {
   BorrowingReference(const BorrowingReference& ref)
       : _value(ref._value), _isDeleted(ref._isDeleted), _strongRefCount(ref._strongRefCount), _weakRefCount(ref._weakRefCount),
         _mutex(ref._mutex) {
-    // increment ref count after copy
-    (*_weakRefCount)++;
+    if (_weakRefCount != nullptr) {
+      // increment ref count after copy
+      (*_weakRefCount)++;
+    }
   }
 
   BorrowingReference(BorrowingReference&& ref)

diff --git a/packages/react-native-nitro-modules/cpp/utils/OwningReference.hpp b/packages/react-native-nitro-modules/cpp/utils/OwningReference.hpp
@@ -39,8 +39,10 @@ class OwningReference final {
   OwningReference(const OwningReference& ref)
       : _value(ref._value), _isDeleted(ref._isDeleted), _strongRefCount(ref._strongRefCount), _weakRefCount(ref._weakRefCount),
         _mutex(ref._mutex) {
-    // increment ref count after copy
-    (*_strongRefCount)++;
+    if (_strongRefCount != nullptr) {
+      // increment ref count after copy
+      (*_strongRefCount)++;
+    }
   }
 
   OwningReference(OwningReference&& ref)

diff --git a/packages/react-native-nitro-modules/cpp/views/CachedProp.hpp b/packages/react-native-nitro-modules/cpp/views/CachedProp.hpp
@@ -32,10 +32,10 @@ namespace margelo::nitro {
         // jsi::Value hasn't changed - no need to convert it again!
         return oldProp;
       }
-      T converted = JSIConverter<T>::fromJSI(runtime, value);
+      auto converted = JSIConverter<T>::fromJSI(runtime, value);
       auto cache = JSICache::getOrCreateCache(runtime);
       auto cached = cache.makeShared(jsi::Value(runtime, value));
-      return CachedProp<T>(std::move(converted), cached, /* isDirty */ true);
+      return CachedProp<T>(std::move(converted), std::move(cached), /* isDirty */ true);
     }
   };