commit 55b011d939ab0c98a0f58eef42014f481a523e96
author Ryan McPherson <ryanthered@gmail.com> Tue May 05 11:30:00 2020 -0700
committer GitHub <noreply@github.com> Tue May 05 14:30:00 2020 -0400
tree e84205310aa6e3f44232940cbc1e14e5e0cf5ec8
parent c2c0f8d35fd9952a8449d4c5606689771c726f63

Exit early from install/transfer callbacks if the dictionary contains an error.  (#461)

src/ios-deploy/ios-deploy.m

diff --git a/src/ios-deploy/ios-deploy.m b/src/ios-deploy/ios-deploy.m
index 0339cf0..0ff4fa2 100644
--- a/src/ios-deploy/ios-deploy.m
+++ b/src/ios-deploy/ios-deploy.m
@@ -634,6 +634,9 @@
 }
 
 mach_error_t transfer_callback(CFDictionaryRef dict, int arg) {
+    if (CFDictionaryGetValue(dict, CFSTR("Error"))) {
+        return 0;
+    }
     int percent;
     CFStringRef status = CFDictionaryGetValue(dict, CFSTR("Status"));
     CFNumberGetValue(CFDictionaryGetValue(dict, CFSTR("PercentComplete")), kCFNumberSInt32Type, &percent);
@@ -661,6 +664,9 @@
 }
 
 mach_error_t install_callback(CFDictionaryRef dict, int arg) {
+    if (CFDictionaryGetValue(dict, CFSTR("Error"))) {
+        return 0;
+    }
     int percent;
     CFStringRef status = CFDictionaryGetValue(dict, CFSTR("Status"));
     CFNumberGetValue(CFDictionaryGetValue(dict, CFSTR("PercentComplete")), kCFNumberSInt32Type, &percent);
@@ -681,21 +687,24 @@
 // use this callback to determine which step is occuring and call the proper
 // callback.
 mach_error_t incremental_install_callback(CFDictionaryRef dict, int arg) {
-  CFStringRef status = CFDictionaryGetValue(dict, CFSTR("Status"));
-  if (CFEqual(status, CFSTR("TransferringPackage"))) {
-    int percent;
-    CFNumberGetValue(CFDictionaryGetValue(dict, CFSTR("PercentComplete")), kCFNumberSInt32Type, &percent);
-    int overall_percent = (percent / 2);
-    NSLogOut(@"[%3d%%] %@", overall_percent, status);
-    NSLogJSON(@{@"Event": @"TransferringPackage",
-                @"OverallPercent": @(overall_percent),
-    });
-    return 0;
-  } else if (CFEqual(status, CFSTR("CopyingFile"))) {
-    return transfer_callback(dict, arg);
-  } else {
-    return install_callback(dict, arg);
-  }
+    if (CFDictionaryGetValue(dict, CFSTR("Error"))) {
+        return 0;
+    }
+    CFStringRef status = CFDictionaryGetValue(dict, CFSTR("Status"));
+    if (CFEqual(status, CFSTR("TransferringPackage"))) {
+        int percent;
+        CFNumberGetValue(CFDictionaryGetValue(dict, CFSTR("PercentComplete")), kCFNumberSInt32Type, &percent);
+        int overall_percent = (percent / 2);
+        NSLogOut(@"[%3d%%] %@", overall_percent, status);
+        NSLogJSON(@{@"Event": @"TransferringPackage",
+                    @"OverallPercent": @(overall_percent),
+                    });
+        return 0;
+    } else if (CFEqual(status, CFSTR("CopyingFile"))) {
+        return transfer_callback(dict, arg);
+    } else {
+        return install_callback(dict, arg);
+    }
 }
 
 CFURLRef copy_device_app_url(AMDeviceRef device, CFStringRef identifier) {