From 0d2fcb1ed7bc9114caf1b7d007df1553f5a07afa Mon Sep 17 00:00:00 2001 From: Valentin Shergin Date: Sun, 10 May 2020 13:26:08 -0700 Subject: [PATCH] Fabric: Making `UIManager::getNewestCloneOfShadowNode` even more safer Summary: We cannot use a raw pointer here because the tree might progress right after we call to `shadowTree.tryCommit` and we will get a dangling pointer as a result. Changelog: [Internal] Fabric-specific internal change. Reviewed By: mdvacca Differential Revision: D21464832 fbshipit-source-id: 3998b39d29db672da54d4adcb6be55cd3d44d862 --- ReactCommon/fabric/uimanager/UIManager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ReactCommon/fabric/uimanager/UIManager.cpp b/ReactCommon/fabric/uimanager/UIManager.cpp index dd83c64d65c..1b9f417d659 100644 --- a/ReactCommon/fabric/uimanager/UIManager.cpp +++ b/ReactCommon/fabric/uimanager/UIManager.cpp @@ -136,12 +136,12 @@ ShadowNode::Shared UIManager::getNewestCloneOfShadowNode( return nullptr; }; - ShadowNode const *ancestorShadowNode; + auto ancestorShadowNode = ShadowNode::Shared{}; shadowTreeRegistry_.visit( shadowNode.getSurfaceId(), [&](ShadowTree const &shadowTree) { shadowTree.tryCommit( [&](RootShadowNode::Shared const &oldRootShadowNode) { - ancestorShadowNode = oldRootShadowNode.get(); + ancestorShadowNode = oldRootShadowNode; return nullptr; }, true);