getNetworkConnectivityLevel can throw under some circumstances. Handle (

microsoft#1795) * getNetworkConnectivityLevel can throw under some circumstances. Handle these and treat the connection status as 'not connected'.
ashvarma · Jan 25, 2017 · b50e3e6 · b50e3e6
1 parent ab08d24
commit b50e3e6
Showing 1 changed file with 16 additions and 13 deletions.
diff --git a/Frameworks/SystemConfiguration/SCNetworkReachability.mm b/Frameworks/SystemConfiguration/SCNetworkReachability.mm
@@ -134,15 +134,19 @@ + (void)_testAllReachabilityObjects {
 
 + (void)_checkGlobalReachability {
     WNCConnectionProfile* internetConnectionProfile = [WNCNetworkInformation getInternetConnectionProfile];
-    if (internetConnectionProfile &&
-        [internetConnectionProfile getNetworkConnectivityLevel] == WNCNetworkConnectivityLevelInternetAccess) {
-        SCNetworkReachabilityFlags newFlags = kSCNetworkReachabilityFlagsReachable;
+    @try {
+        if (internetConnectionProfile &&
+            [internetConnectionProfile getNetworkConnectivityLevel] == WNCNetworkConnectivityLevelInternetAccess) {
+            SCNetworkReachabilityFlags newFlags = kSCNetworkReachabilityFlagsReachable;
 
-        if (internetConnectionProfile.isWwanConnectionProfile) {
-            newFlags |= kSCNetworkReachabilityFlagsIsWWAN;
+            if (internetConnectionProfile.isWwanConnectionProfile) {
+                newFlags |= kSCNetworkReachabilityFlagsIsWWAN;
+            }
+            _globalReachableFlags = newFlags;
+        } else {
+            _globalReachableFlags = 0;
         }
-        _globalReachableFlags = newFlags;
-    } else {
+    } @catch (...) {
         _globalReachableFlags = 0;
     }
 }
@@ -237,12 +241,11 @@ - (void)_availabilityChanged {
     if (_callbackQueue != NULL && _isPerformingCallback == FALSE) {
         _isPerformingCallback = TRUE;
         [self retain];
-        dispatch_async(_callbackQueue,
-                       ^void() {
-                           [self _performCallback];
-                           [self release];
-                           _isPerformingCallback = FALSE;
-                       });
+        dispatch_async(_callbackQueue, ^void() {
+            [self _performCallback];
+            [self release];
+            _isPerformingCallback = FALSE;
+        });
     }
 
     [_reachabilityFlagsValid unlock];