Summary:

shergin · facebook-github-bot · commit 585f7b916d63 · 2018-11-28T17:29:30.000-08:00
Calling -[UIScrollView setContentOffset] with NaN values can cause a crash. That's not clear why exactly the computation returns NaN sometime, but the implemented sanitizing should help to detect this problem during development (and this also prevents the app from crashing).

See attached task for more details.

Reviewed By: fkgozali

Differential Revision: D13242729

fbshipit-source-id: 747bf1b42e02597e9f1300eee24547563ab29b27
diff --git a/React/Views/ScrollView/RCTScrollView.m b/React/Views/ScrollView/RCTScrollView.m
@@ -303,7 +303,10 @@ - (void)setContentOffset:(CGPoint)contentOffset
       contentOffset.y = -(scrollViewSize.height - subviewSize.height) / 2.0;
     }
   }
-  super.contentOffset = contentOffset;
+
+  super.contentOffset = CGPointMake(
+    RCTSanitizeNaNValue(contentOffset.x, @"scrollView.contentOffset.x"),
+    RCTSanitizeNaNValue(contentOffset.y, @"scrollView.contentOffset.y"));
 }
 
 - (void)setFrame:(CGRect)frame

Original file line number	Diff line number	Diff line change
`@@ -303,7 +303,10 @@ - (void)setContentOffset:(CGPoint)contentOffset`
`303`	`303`	`contentOffset.y = -(scrollViewSize.height - subviewSize.height) / 2.0;`
`304`	`304`	`}`
`305`	`305`	`}`
`306`		`- super.contentOffset = contentOffset;`
	`306`	`+`
	`307`	`+ super.contentOffset = CGPointMake(`
	`308`	`+ RCTSanitizeNaNValue(contentOffset.x, @"scrollView.contentOffset.x"),`
	`309`	`+ RCTSanitizeNaNValue(contentOffset.y, @"scrollView.contentOffset.y"));`
`307`	`310`	`}`
`308`	`311`
`309`	`312`	`- (void)setFrame:(CGRect)frame`