Avoid dereferencing a NULL pointer.

project-imas · Feb 8, 2017 · bb2272f · bb2272f
1 parent 0df0dca
commit bb2272f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Incremental Store/EncryptedStore.m b/Incremental Store/EncryptedStore.m
@@ -916,7 +916,7 @@ - (BOOL)checkDatabaseStatusWithError:(NSError *__autoreleasing*)error {
             *error = [NSError errorWithDomain:EncryptedStoreErrorDomain code:EncryptedStoreErrorIncorrectPasscode userInfo:userInfo];
         }
     }
-    return result && (*error == nil);
+    return result && (error == NULL || *error == nil);
 }
 
 - (BOOL)changeDatabasePassphrase:(NSString *)passphrase error:(NSError *__autoreleasing*)error {
@@ -962,7 +962,7 @@ - (BOOL)setDatabasePassphrase:(NSString *)passphrase error:(NSError *__autorelea
         result = [self checkDatabaseStatusWithError:error];
     }
 
-    return result && (*error == nil);
+    return result && (error == NULL || *error == nil);
 }
 
 - (BOOL)validateDatabasePassphrase:(NSString *)passphrase error:(NSError *__autoreleasing*)error {