status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix array bounds crash in MapView 

Summary: Under some circumstances, the calloutIndex might be > number of callout views, (possibly due to a race condition?). This prevents that from crashing.

Reviewed By: tadeuzagallo

Differential Revision: D3196010

fb-gh-sync-id: 6485e64c682937431cb8598d7f3f42e8d37eeff1
fbshipit-source-id: 6485e64c682937431cb8598d7f3f42e8d37eeff1
This commit is contained in:
Nick Lockwood 2016-04-19 05:02:11 -07:00 committed by Facebook Github Bot 5
parent e9398c7926
commit 546d140ec7
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
React/Views/RCTMapManager.m
View File

@ -226,7 +226,8 @@ RCT_CUSTOM_VIEW_PROPERTY(region, MKCoordinateRegion, RCTMap)
}
annotationView.canShowCallout = (annotation.title.length > 0);
if (annotation.leftCalloutViewIndex != NSNotFound) {
if (annotation.leftCalloutViewIndex != NSNotFound &&
annotation.leftCalloutViewIndex < mapView.reactSubviews.count) {
annotationView.leftCalloutAccessoryView =
mapView.reactSubviews[annotation.leftCalloutViewIndex];
} else if (annotation.hasLeftCallout) {
@ -236,7 +237,8 @@ RCT_CUSTOM_VIEW_PROPERTY(region, MKCoordinateRegion, RCTMap)
annotationView.leftCalloutAccessoryView = nil;
}
if (annotation.rightCalloutViewIndex != NSNotFound) {
if (annotation.rightCalloutViewIndex != NSNotFound &&
annotation.rightCalloutViewIndex < mapView.reactSubviews.count) {
annotationView.rightCalloutAccessoryView =
mapView.reactSubviews[annotation.rightCalloutViewIndex];
} else if (annotation.hasRightCallout) {
@ -248,7 +250,8 @@ RCT_CUSTOM_VIEW_PROPERTY(region, MKCoordinateRegion, RCTMap)
//http://stackoverflow.com/questions/32581049/mapkit-ios-9-detailcalloutaccessoryview-usage
if ([annotationView respondsToSelector:@selector(detailCalloutAccessoryView)]) {
if (annotation.detailCalloutViewIndex != NSNotFound) {
if (annotation.detailCalloutViewIndex != NSNotFound &&
annotation.detailCalloutViewIndex < mapView.reactSubviews.count) {
UIView *calloutView = mapView.reactSubviews[annotation.detailCalloutViewIndex];
NSLayoutConstraint *widthConstraint =
[NSLayoutConstraint constraintWithItem:calloutView