Merge branch 'ChristianKienle-master'

1 files changed, 5 insertions, 4 deletions

diff --git a/src/fmdb/FMResultSet.m b/src/fmdb/FMResultSet.m
index a49fc4b..ca7e166 100644
--- a/src/fmdb/FMResultSet.m
+++ b/src/fmdb/FMResultSet.m
@@ -314,9 +314,9 @@
         return nil;
     }
     
-    int dataSize = sqlite3_column_bytes([_statement statement], columnIdx);
     const char *dataBuffer = sqlite3_column_blob([_statement statement], columnIdx);
-    
+    int dataSize = sqlite3_column_bytes([_statement statement], columnIdx);
+
     if (dataBuffer == NULL) {
         return nil;
     }
@@ -334,10 +334,11 @@
     if (sqlite3_column_type([_statement statement], columnIdx) == SQLITE_NULL || (columnIdx < 0)) {
         return nil;
     }
-    
+  
+    const char *dataBuffer = sqlite3_column_blob([_statement statement], columnIdx);
     int dataSize = sqlite3_column_bytes([_statement statement], columnIdx);
     
-    NSData *data = [NSData dataWithBytesNoCopy:(void *)sqlite3_column_blob([_statement statement], columnIdx) length:(NSUInteger)dataSize freeWhenDone:NO];
+    NSData *data = [NSData dataWithBytesNoCopy:(void *)dataBuffer length:(NSUInteger)dataSize freeWhenDone:NO];
     
     return data;
 }