Make sure _locked_constrainedSizeForLayoutPass is called with the loc…

…k held (#488)
TextureGroup · Aug 4, 2017 · 3c6b836 · 3c6b836
1 parent 27abc77
commit 3c6b836
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/Source/ASDisplayNode+Layout.mm b/Source/ASDisplayNode+Layout.mm
@@ -520,7 +520,14 @@ - (void)transitionLayoutWithAnimation:(BOOL)animated
                 measurementCompletion:(void(^)())completion
 {
   ASDisplayNodeAssertMainThread();
-  [self transitionLayoutWithSizeRange:[self _locked_constrainedSizeForLayoutPass]
+
+  ASSizeRange sizeRange;
+  {
+    ASDN::MutexLocker l(__instanceLock__);
+    sizeRange = [self _locked_constrainedSizeForLayoutPass];
+  }
+
+  [self transitionLayoutWithSizeRange:sizeRange
                              animated:animated
                    shouldMeasureAsync:shouldMeasureAsync
                 measurementCompletion:completion];