Merge pull request #789 from ccgus/robertmryan/mrc-garbage-value

Uninitialized object in manual reference counting
ccgus · May 8, 2020 · 2417aa4 · 2417aa4
2 parents abbaa01 + 713da2d
commit 2417aa4
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/src/fmdb/FMDatabaseQueue.m b/src/fmdb/FMDatabaseQueue.m
@@ -301,17 +301,13 @@ - (BOOL)checkpoint:(FMDBCheckpointMode)mode name:(NSString *)name error:(NSError
 - (BOOL)checkpoint:(FMDBCheckpointMode)mode name:(NSString *)name logFrameCount:(int * _Nullable)logFrameCount checkpointCount:(int * _Nullable)checkpointCount error:(NSError * __autoreleasing _Nullable * _Nullable)error
 {
     __block BOOL result;
-    __block NSError *blockError;
-
+
     FMDBRetain(self);
     dispatch_sync(_queue, ^() {
-        result = [self.database checkpoint:mode name:name logFrameCount:logFrameCount checkpointCount:checkpointCount error:&blockError];
+        result = [self.database checkpoint:mode name:name logFrameCount:logFrameCount checkpointCount:checkpointCount error:error];
     });
     FMDBRelease(self);
 
-    if (error) {
-        *error = blockError;
-    }
     return result;
 }