* Basic math is hard sometimes (fixes an issue introduced by me in b2d798ba9282d3acf1a2d65de30849e529d4d255)

* Fix an exception that could occur when trying to view a damaged table
* Fix a theoretical use-after-free issue by a wrongly structured retain/release in a setter

1 files changed, 3 insertions, 3 deletions

diff --git a/Source/SPDatabaseDocument.m b/Source/SPDatabaseDocument.m
index 2f7a5235..76dda407 100644
--- a/Source/SPDatabaseDocument.m
+++ b/Source/SPDatabaseDocument.m
@@ -1729,20 +1729,20 @@ static int64_t SPDatabaseDocumentInstanceCounter = 0;
 {
 	_supportsEncoding = YES;
 
-	NSString *mysqlEncoding = [databaseDataInstance getDatabaseDefaultCharacterSet];
+	NSString *mysqlEncoding = [[databaseDataInstance getDatabaseDefaultCharacterSet] retain];
 
 	SPClear(selectedDatabaseEncoding);
 
 	// Fallback or older version? -> set encoding to mysql default encoding latin1
 	if ( !mysqlEncoding ) {
-		NSLog(@"Error: no character encoding found, mysql version is %@", [self mySQLVersion]);
+		NSLog(@"Error: no character encoding found for db, mysql version is %@", [self mySQLVersion]);
 		
 		selectedDatabaseEncoding = [[NSString alloc] initWithString:@"latin1"];
 		
 		_supportsEncoding = NO;
 	} 
 	else {
-		selectedDatabaseEncoding = [mysqlEncoding retain];
+		selectedDatabaseEncoding = mysqlEncoding;
 	}
 }