Use dataWithBytes instead of memcpy

yl365 · Jun 3, 2014 · aada6f6 · aada6f6
1 parent 251fe30
commit aada6f6
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/fmdb/FMResultSet.m b/src/fmdb/FMResultSet.m
@@ -290,12 +290,13 @@ - (NSData*)dataForColumnIndex:(int)columnIdx {
     }
 
     int dataSize = sqlite3_column_bytes([_statement statement], columnIdx);
+    const char *dataBuffer = sqlite3_column_blob([_statement statement], columnIdx);
 
-    NSMutableData *data = [NSMutableData dataWithLength:(NSUInteger)dataSize];
-
-    memcpy([data mutableBytes], sqlite3_column_blob([_statement statement], columnIdx), (size_t)dataSize);
+    if (dataBuffer == NULL) {
+        return nil;
+    }
 
-    return data;
+    return [NSData dataWithBytes:(const void *)dataBuffer length:(NSUInteger)dataSize];
 }