Fix the bug I introduced in #1030 (#1035)

TextureGroup · Jul 17, 2018 · cf810ac · cf810ac
1 parent 6ed5ba2
commit cf810ac
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/Source/Layout/ASLayout.mm b/Source/Layout/ASLayout.mm
@@ -172,7 +172,10 @@ - (void)dealloc
 {
   if (_retainSublayoutElements.load()) {
     for (ASLayout *sublayout in _sublayouts) {
-      CFRelease((__bridge CFTypeRef)sublayout);
+      // We retained this, so there's no risk of it deallocating on us.
+      if (let cfElement = (__bridge CFTypeRef)sublayout->_layoutElement) {
+        CFRelease(cfElement);
+      }
     }
   }
 }
@@ -186,7 +189,8 @@ - (void)retainSublayoutElements
   }
 
   for (ASLayout *sublayout in _sublayouts) {
-    CFRetain((__bridge CFTypeRef)sublayout->_layoutElement);
+    // CFBridgingRetain atomically casts and retains. We need the atomicity.
+    CFBridgingRetain(sublayout->_layoutElement);
   }
 }