Skip to content

issuefix, dataBuffer type fix #725

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Lision wants to merge 1 commit into
base: master
Choose a base branch
from
Open

issuefix, dataBuffer type fix #725

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/fmdb/FMResultSet.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,14 +322,14 @@ - (NSData*)dataForColumnIndex:(int)columnIdx {
return nil;
}

const char *dataBuffer = sqlite3_column_blob([_statement statement], columnIdx);
const void *dataBuffer = sqlite3_column_blob([_statement statement], columnIdx);
int dataSize = sqlite3_column_bytes([_statement statement], columnIdx);

if (dataBuffer == NULL) {
return nil;
}

return [NSData dataWithBytes:(const void *)dataBuffer length:(NSUInteger)dataSize];
return [NSData dataWithBytes:dataBuffer length:(NSUInteger)dataSize];
}


Expand All @@ -343,12 +343,14 @@ - (NSData*)dataNoCopyForColumnIndex:(int)columnIdx {
return nil;
}

const char *dataBuffer = sqlite3_column_blob([_statement statement], columnIdx);
const void *dataBuffer = sqlite3_column_blob([_statement statement], columnIdx);
int dataSize = sqlite3_column_bytes([_statement statement], columnIdx);

NSData *data = [NSData dataWithBytesNoCopy:(void *)dataBuffer length:(NSUInteger)dataSize freeWhenDone:NO];
if (dataBuffer == NULL) {
return nil;
}

return data;
return [NSData dataWithBytesNoCopy:(void *)dataBuffer length:(NSUInteger)dataSize freeWhenDone:NO];
}


Expand Down