Monotone-Parent: 8ce20f3e6c9cc1f103737e56f5dd42c49d70277b

Monotone-Revision: 6267e23d4a4d587847618923c35a202030ce9ed0

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-10-13T14:09:18
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2009-10-13 14:09:18 +00:00
parent 9d1a9ae76d
commit 049be25681
2 changed files with 10 additions and 10 deletions

View File

@ -1,3 +1,9 @@
2009-10-13 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* GCSFolder.m (_tableRequirementForFields:andOrQualifier:): fixed
a double release of "allFields" occuring in the rare case where
the amount of fields would be 0.
2009-09-10 Cyril Robert <crobert@inverse.ca>
* GCSFolder.m (deleteAllContent): New method to delete everything in the

View File

@ -295,7 +295,7 @@ static NSArray *contentFieldNames = nil;
unsigned int fieldCount;
requirement = noTableRequired;
allFields = [NSMutableArray new];
allFields = [NSMutableArray array];
if ([fields count])
[allFields addObjectsFromArray: fields];
quFields = [[qualifier allQualifierKeys] allObjects];
@ -314,13 +314,8 @@ static NSArray *contentFieldNames = nil;
requirement |= quickTableRequired;
}
else
{
[allFields release];
[NSException raise: @"GCSFolderMissingFieldNames"
format: @"No field specified for query"];
}
[allFields release];
[NSException raise: @"GCSFolderMissingFieldNames"
format: @"No field specified for query"];
return requirement;
}
@ -456,7 +451,7 @@ static NSArray *contentFieldNames = nil;
[sql appendString: [self storeTableName]];
}
whereSql = [NSMutableArray new];
whereSql = [NSMutableArray array];
if (qualifier)
{
whereString = [NSString stringWithFormat: @"(%@)",
@ -476,7 +471,6 @@ static NSArray *contentFieldNames = nil;
if ([whereSql count])
[sql appendFormat: @" WHERE %@",
[whereSql componentsJoinedByString: @" AND "]];
[whereSql release];
sortOrderings = [spec sortOrderings];
if ([sortOrderings count] > 0)