Fix crash when frame.origin has NaN

cntrump · Dec 22, 2021 · 209393b · 209393b
1 parent a6ee531
commit 209393b
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/YogaKit/Source/UIView+Yoga.m b/YogaKit/Source/UIView+Yoga.m
@@ -31,6 +31,17 @@ - (BOOL)isYogaEnabled {
 
 static void YogaSwizzleInstanceMethod(Class cls, SEL originalSelector, SEL swizzledSelector);
 
+static inline CGRect CorrectRectIfNeeded(CGRect rect) {
+    CGPoint origin = rect.origin;
+    CGSize size = rect.size;
+
+#define CorrectValueIfNeeded(x) (isnan(x) ? 0 : x)
+
+    return CGRectMake(CorrectValueIfNeeded(origin.x),
+                      CorrectValueIfNeeded(origin.y),
+                      size.width, size.height);
+}
+
 @implementation UIView (YogaKitAutoApplyLayout)
 
 + (void)load {
@@ -74,6 +85,7 @@ - (BOOL)_yoga_isFittingSize {
 #endif
 
 - (instancetype)_yoga_initWithFrame:(CGRect)frame {
+    frame = CorrectRectIfNeeded(frame);
     id _self = [self _yoga_initWithFrame:frame];
     if (_self) {
         [self _yoga_applyLayout];
@@ -83,6 +95,7 @@ - (instancetype)_yoga_initWithFrame:(CGRect)frame {
 }
 
 - (void)_yoga_setFrame:(CGRect)frame {
+    frame = CorrectRectIfNeeded(frame);
     [self _yoga_setFrame:frame];
     [self _yoga_applyLayout];
 
@@ -93,6 +106,7 @@ - (void)_yoga_setFrame:(CGRect)frame {
 }
 
 - (void)_yoga_setBounds:(CGRect)bounds {
+    bounds = CorrectRectIfNeeded(bounds);
     [self _yoga_setBounds:bounds];
     [self _yoga_applyLayout];