Merge branch 'master' into TIMOB-27465

tidev · Oct 14, 2019 · 1bcd5e8 · 1bcd5e8
2 parents 2f2d1c4 + 2ac7d80
commit 1bcd5e8
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/iphone/TitaniumKit/TitaniumKit/Sources/API/TiProxy.m b/iphone/TitaniumKit/TitaniumKit/Sources/API/TiProxy.m
@@ -638,9 +638,12 @@ - (void)rememberProxy:(TiProxy *)rememberedProxy
   if ((bridgeCount == 1) && (pageKrollObject != nil)) {
     if (rememberedProxy == self) {
       [pageKrollObject protectJsobject];
+      [pageKrollObject removeGarbageCollectionSafeguard];
       return;
     }
-    [pageKrollObject noteKeylessKrollObject:[rememberedProxy krollObjectForBridge:(KrollBridge *)pageContext]];
+    KrollObject *krollObject = [rememberedProxy krollObjectForBridge:(KrollBridge *)pageContext];
+    [pageKrollObject noteKeylessKrollObject:krollObject];
+    [krollObject removeGarbageCollectionSafeguard];
     return;
   }
   if (bridgeCount < 1) {
@@ -652,13 +655,16 @@ - (void)rememberProxy:(TiProxy *)rememberedProxy
     if (rememberedProxy == self) {
       KrollObject *thisObject = [thisBridge krollObjectForProxy:self];
       [thisObject protectJsobject];
+      [thisObject removeGarbageCollectionSafeguard];
       continue;
     }
 
     if (![thisBridge usesProxy:rememberedProxy]) {
       continue;
     }
-    [[thisBridge krollObjectForProxy:self] noteKeylessKrollObject:[thisBridge krollObjectForProxy:rememberedProxy]];
+    KrollObject *krollObject = [thisBridge krollObjectForProxy:rememberedProxy];
+    [[thisBridge krollObjectForProxy:self] noteKeylessKrollObject:krollObject];
+    [krollObject removeGarbageCollectionSafeguard];
   }
 }