Skip to content

Fix a crash if value isn't UTF8 string #523

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
elliotfiske wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix a crash if value isn't UTF8 string #523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
be36a6a
Fix a crash if value isn't UTF8 string
elliotfiske Aug 29, 2016
d4a4fd8
Fix UTF8 bug, with unit test
elliotfiske Aug 30, 2016
abebcb4
Merge branch 'patch-1' of github.com:elliotfiske/fmdb into fix-utf8
elliotfiske Aug 30, 2016
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
11 changes: 11 additions & 0 deletions Tests/FMDatabaseTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,17 @@ - (void)testUTF8Strings
XCTAssertFalse([self.db hadError], @"Shouldn't have any errors");
}

- (void)testNonUTF8Data
{
[self.db executeUpdate:@"create table utf8bug (a blob)"];
XCTAssertTrue(([self.db executeUpdate:@"insert into utf8bug (a) values (?)", [NSData dataWithBytes:"\xFF\xFF" length:4]]));

[self.db executeStatements:@"select * from utf8bug" withResultBlock:^int(NSDictionary *results) {
NSLog(@"%@", results);
return 0;
}];
}

- (void)testArgumentsInArray
{
[self.db executeUpdate:@"create table testOneHundredTwelvePointTwo (a text, b integer)"];
Expand Down
3 changes: 3 additions & 0 deletions src/fmdb/FMDatabase.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1210,6 +1210,9 @@ int FMDBExecuteBulkSQLCallback(void *theBlockAsVoid, int columns, char **values,
for (NSInteger i = 0; i < columns; i++) {
NSString *key = [NSString stringWithUTF8String:names[i]];
id value = values[i] ? [NSString stringWithUTF8String:values[i]] : [NSNull null];
if (value == nil) {
value = [NSString stringWithCString:values[i] encoding:NSASCIIStringEncoding];
}
[dictionary setObject:value forKey:key];
}

Expand Down