fix: Cache shared_ptr leak

NativeScript · May 24, 2023 · 8236cf3 · 8236cf3
1 parent 7e24de8
commit 8236cf3
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/NativeScript/runtime/ClassBuilder.mm b/NativeScript/runtime/ClassBuilder.mm
@@ -227,6 +227,9 @@
         cache->CtorFuncs.emplace(extendedClassName, poExtendedClassCtorFunc);
 
         IMP newInitialize = imp_implementationWithBlock(^(id self) {
+            if (!Runtime::IsAlive(isolate) || !isolateWrapper.IsValid()) {
+                return;
+            }
             v8::Locker locker(isolate);
             Isolate::Scope isolate_scope(isolate);
             HandleScope handle_scope(isolate);
@@ -261,9 +264,13 @@
         /// in order to make both of them destroyable/GC-able. When the JavaScript object is GC-ed we release the native counterpart as well.
         void (*retain)(id, SEL) = (void (*)(id, SEL))FindNotOverridenMethod(extendedClass, @selector(retain));
         IMP newRetain = imp_implementationWithBlock(^(id self) {
+            if (!Runtime::IsAlive(isolate) || !isolateWrapper.IsValid()) {
+                return retain(self, @selector(retain));
+            }
             if ([self retainCount] == 1) {
-                auto it = cache->Instances.find(self);
-                if (it != cache->Instances.end()) {
+                auto innerCache = isolateWrapper.GetCache();
+                auto it = innerCache->Instances.find(self);
+                if (it != innerCache->Instances.end()) {
                     v8::Locker locker(isolate);
                     Isolate::Scope isolate_scope(isolate);
                     HandleScope handle_scope(isolate);
@@ -283,12 +290,14 @@
         void (*release)(id, SEL) = (void (*)(id, SEL))FindNotOverridenMethod(extendedClass, @selector(release));
         IMP newRelease = imp_implementationWithBlock(^(id self) {
             if (!Runtime::IsAlive(isolate) || !isolateWrapper.IsValid()) {
+                release(self, @selector(release));
                 return;
             }
 
             if ([self retainCount] == 2) {
-                auto it = cache->Instances.find(self);
-                if (it != cache->Instances.end()) {
+                auto innerCache = isolateWrapper.GetCache();
+                auto it = innerCache->Instances.find(self);
+                if (it != innerCache->Instances.end()) {
                     v8::Locker locker(isolate);
                     Isolate::Scope isolate_scope(isolate);
                     HandleScope handle_scope(isolate);