From ac7ba3ea16472d5eb05a7a27f6b8fa57eb844d04 Mon Sep 17 00:00:00 2001 From: Peter Argany Date: Thu, 18 Mar 2021 18:26:09 -0700 Subject: [PATCH] Fix leak checker crash in bridgeless mode Summary: Fast follow to D26727461 (https://github.com/facebook/react-native/commit/34d189ae09b32261e1a2055263bd425f8a82a4c6), in bridgeless mode, `_contextContainer` doesn't have bridge, so avoid setting up `garbageCollectionTrigger`. Changelog: [Internal] Reviewed By: sammy-SC Differential Revision: D27173725 fbshipit-source-id: 5530c43638c17fb03e065c11667786efe9f3ef11 --- React/Fabric/RCTSurfacePresenter.mm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/React/Fabric/RCTSurfacePresenter.mm b/React/Fabric/RCTSurfacePresenter.mm index 46fdcad17cf..e6e8ee4eb56 100644 --- a/React/Fabric/RCTSurfacePresenter.mm +++ b/React/Fabric/RCTSurfacePresenter.mm @@ -291,13 +291,16 @@ static BackgroundExecutor RCTGetBackgroundExecutor() } #ifdef REACT_NATIVE_DEBUG - RCTBridge *bridge = (RCTBridge *)unwrapManagedObjectWeakly(_contextContainer->at>("Bridge")); - toolbox.garbageCollectionTrigger = [bridge]() { - RCTCxxBridge *batchedBridge = (RCTCxxBridge *)([bridge batchedBridge] ?: bridge); - if ([batchedBridge respondsToSelector:@selector(forceGarbageCollection)]) { - [batchedBridge forceGarbageCollection]; - } - }; + auto optionalBridge = _contextContainer->find>("Bridge"); + if (optionalBridge) { + RCTBridge *bridge = unwrapManagedObjectWeakly(optionalBridge.value()); + toolbox.garbageCollectionTrigger = [bridge]() { + RCTCxxBridge *batchedBridge = (RCTCxxBridge *)([bridge batchedBridge] ?: bridge); + if ([batchedBridge respondsToSelector:@selector(forceGarbageCollection)]) { + [batchedBridge forceGarbageCollection]; + } + }; + } #endif toolbox.synchronousEventBeatFactory = [runtimeExecutor](EventBeat::SharedOwnerBox const &ownerBox) {