diff options
author | August Mueller <gus@flyingmeat.com> | 2015-07-01 19:18:58 +0300 |
---|---|---|
committer | August Mueller <gus@flyingmeat.com> | 2015-07-01 19:18:58 +0300 |
commit | 1b346b527179f8869d6e8332917c80ac83337ee8 (patch) | |
tree | bcc10329191095e42b394a60d1072dff17148a05 | |
parent | 1a30bddb8b5dcebac820a1585d0b4e891cfd24d2 (diff) | |
parent | efdf7c56799d335c061e70bb8f7ecd876e7a416d (diff) |
Merge branch 'Sigmanet15-master'
-rw-r--r-- | src/fmdb/FMDatabase.m | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/fmdb/FMDatabase.m b/src/fmdb/FMDatabase.m index 9169554..9e1b4d4 100644 --- a/src/fmdb/FMDatabase.m +++ b/src/fmdb/FMDatabase.m @@ -1315,7 +1315,9 @@ static NSString *FMDBEscapeSavePointName(NSString *savepointName) { return err; } - block(&shouldRollback); + if (block) { + block(&shouldRollback); + } if (shouldRollback) { // We need to rollback and release this savepoint to remove it @@ -1356,7 +1358,9 @@ void FMDBBlockSQLiteCallBackFunction(sqlite3_context *context, int argc, sqlite3 #else void (^block)(sqlite3_context *context, int argc, sqlite3_value **argv) = (__bridge id)sqlite3_user_data(context); #endif - block(context, argc, argv); + if (block) { + block(context, argc, argv); + } } |