aboutsummaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorrowanbeentje <rowan@beent.je>2014-06-16 02:28:25 +0100
committerrowanbeentje <rowan@beent.je>2014-06-16 02:28:25 +0100
commit690c2fa83a5a3138bf4aa0fa862565c833b72d2a (patch)
tree799539bb55df6b2c4ff65709fd1add69fcc074ce /Source
parentae239070319b0a8cacc8b17cdcb245ce29956759 (diff)
downloadsequelpro-690c2fa83a5a3138bf4aa0fa862565c833b72d2a.tar.gz
sequelpro-690c2fa83a5a3138bf4aa0fa862565c833b72d2a.tar.bz2
sequelpro-690c2fa83a5a3138bf4aa0fa862565c833b72d2a.zip
Add a safety check within [SPCopyTable shouldUseFieldEditorForRow:column:] for use when loading tables, which may improve Issue #1925 and Issue #1902.
Diffstat (limited to 'Source')
-rw-r--r--Source/SPCopyTable.h5
-rw-r--r--Source/SPCopyTable.m22
-rw-r--r--Source/SPCustomQuery.m6
-rw-r--r--Source/SPTableContentDataSource.m9
-rw-r--r--Source/SPTableContentDelegate.m4
5 files changed, 35 insertions, 11 deletions
diff --git a/Source/SPCopyTable.h b/Source/SPCopyTable.h
index bb23a9c5..02bc2fb4 100644
--- a/Source/SPCopyTable.h
+++ b/Source/SPCopyTable.h
@@ -183,15 +183,16 @@ extern NSInteger SPEditCopyAsSQL;
- (BOOL)isCellComplex;
/*!
- @method shouldUseFieldEditorForRow:column:
+ @method shouldUseFieldEditorForRow:column:useLock:
@abstract Determine whether to trigger sheet editing or in-cell editing for a cell
@discussion Checks the column data type, and the cell contents if necessary, to check
the most appropriate editing type.
@param rowIndex The row in the table the cell is present in
@param colIndex The *original* column in the table the cell is present in (ie pre-reordering)
+ @param dataLock An optional pthread_mutex_t lock to use when checking the data
@result YES if sheet editing should be used, NO otherwise.
*/
-- (BOOL)shouldUseFieldEditorForRow:(NSUInteger)rowIndex column:(NSUInteger)colIndex;
+- (BOOL)shouldUseFieldEditorForRow:(NSUInteger)rowIndex column:(NSUInteger)colIndex checkWithLock:(pthread_mutex_t *)dataLock;
- (IBAction)executeBundleItemForDataTable:(id)sender;
diff --git a/Source/SPCopyTable.m b/Source/SPCopyTable.m
index 958dd4d5..8eb33525 100644
--- a/Source/SPCopyTable.m
+++ b/Source/SPCopyTable.m
@@ -52,6 +52,7 @@
#import "SPDatabaseContentViewDelegate.h"
#import <SPMySQL/SPMySQL.h>
+#import "pthread.h"
NSInteger SPEditMenuCopy = 2001;
NSInteger SPEditMenuCopyWithColumns = 2002;
@@ -1186,7 +1187,7 @@ static const NSInteger kBlobAsImageFile = 4;
* Determine whether to use the sheet for editing; do so if the multipleLineEditingButton is enabled,
* or if the column was a blob or a text, or if it contains linebreaks.
*/
-- (BOOL)shouldUseFieldEditorForRow:(NSUInteger)rowIndex column:(NSUInteger)colIndex
+- (BOOL)shouldUseFieldEditorForRow:(NSUInteger)rowIndex column:(NSUInteger)colIndex checkWithLock:(pthread_mutex_t *)dataLock
{
// Retrieve the column definition
NSDictionary *columnDefinition = [[(id <SPDatabaseContentViewDelegate>)[self delegate] dataColumnDefinitions] objectAtIndex:colIndex];
@@ -1203,7 +1204,24 @@ static const NSInteger kBlobAsImageFile = 4;
if (isBlob && ![columnType isEqualToString:@"enum"]) return YES;
// Otherwise, check the cell value for newlines.
- id cellValue = [tableStorage cellDataAtRow:rowIndex column:colIndex];
+ id cellValue = nil;
+
+ // If a data lock was supplied, use it and perform additional checks for safety
+ if (dataLock) {
+ pthread_mutex_lock(dataLock);
+
+ if (rowIndex < [tableStorage count] && colIndex < [tableStorage columnCount]) {
+ cellValue = [tableStorage cellDataAtRow:rowIndex column:colIndex];
+ }
+
+ pthread_mutex_unlock(dataLock);
+
+ if (!cellValue) return YES;
+
+ // Otherwise grab the value directly
+ } else {
+ cellValue = [tableStorage cellDataAtRow:rowIndex column:colIndex];
+ }
if ([cellValue isKindOfClass:[NSData class]]) {
cellValue = [[[NSString alloc] initWithData:cellValue encoding:[mySQLConnection stringEncoding]] autorelease];
diff --git a/Source/SPCustomQuery.m b/Source/SPCustomQuery.m
index 8a2031f1..083de5c3 100644
--- a/Source/SPCustomQuery.m
+++ b/Source/SPCustomQuery.m
@@ -2121,7 +2121,7 @@
// If the current cell should have been edited in a sheet, do nothing - field closing will have already
// updated the field.
- if ([customQueryView shouldUseFieldEditorForRow:rowIndex column:[[aTableColumn identifier] integerValue]]) {
+ if ([customQueryView shouldUseFieldEditorForRow:rowIndex column:[[aTableColumn identifier] integerValue] checkWithLock:NULL]) {
return;
}
@@ -2449,7 +2449,7 @@
|| [[columnDefinition objectForKey:@"typegrouping"] isEqualToString:@"blobdata"]);
// Open the editing sheet if required
- if ([customQueryView shouldUseFieldEditorForRow:rowIndex column:[[aTableColumn identifier] integerValue]])
+ if ([customQueryView shouldUseFieldEditorForRow:rowIndex column:[[aTableColumn identifier] integerValue] checkWithLock:NULL])
{
if (fieldEditor) [fieldEditor release], fieldEditor = nil;
fieldEditor = [[SPFieldEditorController alloc] init];
@@ -3851,7 +3851,7 @@
isFieldEditable = shouldBeginEditing;
// Open the field editor sheet if required
- if ([customQueryView shouldUseFieldEditorForRow:row column:column])
+ if ([customQueryView shouldUseFieldEditorForRow:row column:column checkWithLock:NULL])
{
[customQueryView setFieldEditorSelectedRange:[aFieldEditor selectedRange]];
diff --git a/Source/SPTableContentDataSource.m b/Source/SPTableContentDataSource.m
index d02c666c..52170a2b 100644
--- a/Source/SPTableContentDataSource.m
+++ b/Source/SPTableContentDataSource.m
@@ -129,7 +129,12 @@
return [NSString stringWithFormat:@"0x%@", [value dataToHexString]];
}
- if ([tableContentView shouldUseFieldEditorForRow:rowIndex column:columnIndex]) {
+ pthread_mutex_t *fieldEditorCheckLock = NULL;
+ if (isWorking) {
+ fieldEditorCheckLock = &tableValuesLock;
+ }
+
+ if ([tableContentView shouldUseFieldEditorForRow:rowIndex column:columnIndex checkWithLock:fieldEditorCheckLock]) {
return [value shortStringRepresentationUsingEncoding:[mySQLConnection stringEncoding]];
}
@@ -167,7 +172,7 @@
// If the current cell should have been edited in a sheet, do nothing - field closing will have already
// updated the field.
- if ([tableContentView shouldUseFieldEditorForRow:rowIndex column:[[tableColumn identifier] integerValue]]) {
+ if ([tableContentView shouldUseFieldEditorForRow:rowIndex column:[[tableColumn identifier] integerValue] checkWithLock:NULL]) {
return;
}
diff --git a/Source/SPTableContentDelegate.m b/Source/SPTableContentDelegate.m
index ee22c03d..23cbfb6c 100644
--- a/Source/SPTableContentDelegate.m
+++ b/Source/SPTableContentDelegate.m
@@ -262,7 +262,7 @@
}
// Open the editing sheet if required
- if ([tableContentView shouldUseFieldEditorForRow:rowIndex column:[[tableColumn identifier] integerValue]]) {
+ if ([tableContentView shouldUseFieldEditorForRow:rowIndex column:[[tableColumn identifier] integerValue] checkWithLock:NULL]) {
// Retrieve the column definition
NSDictionary *columnDefinition = [cqColumnDefinition objectAtIndex:[[tableColumn identifier] integerValue]];
@@ -750,7 +750,7 @@
}
// Open the field editor sheet if required
- if ([tableContentView shouldUseFieldEditorForRow:row column:column])
+ if ([tableContentView shouldUseFieldEditorForRow:row column:column checkWithLock:NULL])
{
[tableContentView setFieldEditorSelectedRange:[aFieldEditor selectedRange]];