Merge pull request #497 from Microsoft/prevent-rollback-crash

Prevent crashes during rollbacks

Author: geof90

ios/CodePush/CodePush.m

@@ -455,9 +455,16 @@ - (void)rollbackPackage
 {
     NSError *error;
     NSDictionary *failedPackage = [CodePushPackage getCurrentPackage:&error];
-
-    // Write the current package's metadata to the "failed list"
-    [self saveFailedUpdate:failedPackage];
+    if (!failedPackage) {
+        if (error) {
+            CPLog(@"Error getting current update metadata during rollback: %@", error);
+        } else {
+            CPLog(@"Attempted to perform a rollback when there is no current update");
+        }
+    } else {
+        // Write the current package's metadata to the "failed list"
+        [self saveFailedUpdate:failedPackage];
+    }
 
     // Rollback to the previous version and de-register the new update
     [CodePushPackage rollbackPackage];

ios/CodePush/CodePushPackage.m

@@ -491,11 +491,13 @@ + (void)rollbackPackage
     NSError *error;
     NSMutableDictionary *info = [self getCurrentPackageInfo:&error];
     if (error) {
+        CPLog(@"Error getting current package info: %@", error);
         return;
     }
 
     NSString *currentPackageFolderPath = [self getCurrentPackageFolderPath:&error];
     if (error) {
+        CPLog(@"Error getting current package folder path: %@", error);
         return;
     }
 
@@ -515,11 +517,9 @@ + (void)rollbackPackage
 + (void)updateCurrentPackageInfo:(NSDictionary *)packageInfo
                            error:(NSError **)error
 {
-    
     NSData *packageInfoData = [NSJSONSerialization dataWithJSONObject:packageInfo
                                                               options:0
                                                                 error:error];
-    
     NSString *packageInfoString = [[NSString alloc] initWithData:packageInfoData
                                                         encoding:NSUTF8StringEncoding];
     [packageInfoString writeToFile:[self getStatusFilePath]