LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Monotone-Parent: cb733881e889b29228b9fe08863399e209c1c838 

Monotone-Revision: 834ab880181b91930d46cc8ba5f57844160ae395

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-02-09T22:56:03
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2011-02-09 22:56:03 +00:00
parent 465e03ad9c
commit 11b792969d
2 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -9,6 +9,8 @@
PR_SENDER_EMAIL_ADDRESS_UNICODE,
PR_RECEIVED_BY_EMAIL_ADDRESS_UNICODE and
PR_RCVD_REPRESENTING_EMAIL_ADDRESS_UNICODE.
Removed code returning MAPI_E_NOT_ENOUGH_MEMORY when content
values where larger than 3999 bytes.
2011-02-07 Wolfgang Sourdeau <wsourdeau@inverse.ca>

32
OpenChange/MAPIStoreMailMessageTable.m
View File

@ -118,7 +118,7 @@ static EOQualifier *nonDeletedQualifier = nil;
withTag: (enum MAPITAGS) propTag
{
SOGoMailObject *child;
NSString *childURL, *subject, *stringValue;
NSString *subject, *stringValue;
NSInteger colIdx;
enum MAPISTATUS rc;
@ -364,21 +364,9 @@ static EOQualifier *nonDeletedQualifier = nil;
result = [[result valueForKey: @"RawResponse"] objectForKey: @"fetch"];
key = [[keys objectAtIndex: 0] objectForKey: @"key"];
content = [[result objectForKey: key] objectForKey: @"data"];
if ([content length] > 3999)
{
childURL = [NSString stringWithFormat: @"%@%@", folderURL, childKey];
[context registerValue: content
asProperty: propTag
forURL: childURL];
*data = NULL;
rc = MAPI_E_NOT_ENOUGH_MEMORY;
}
else
{
stringValue = [[NSString alloc] initWithData: content
encoding: NSISOLatin1StringEncoding];
*data = [stringValue asUnicodeInMemCtx: memCtx];
}
stringValue = [[NSString alloc] initWithData: content
encoding: NSISOLatin1StringEncoding];
*data = [stringValue asUnicodeInMemCtx: memCtx];
}
else
rc = MAPI_E_NOT_FOUND;
@ -409,17 +397,7 @@ static EOQualifier *nonDeletedQualifier = nil;
@"fetch"];
key = [[keys objectAtIndex: 0] objectForKey: @"key"];
content = [[result objectForKey: key] objectForKey: @"data"];
if ([content length] > 3999)
{
childURL = [NSString stringWithFormat: @"%@%@", folderURL, childKey];
[context registerValue: content
asProperty: propTag
forURL: childURL];
*data = NULL;
rc = MAPI_E_NOT_ENOUGH_MEMORY;
}
else
*data = [content asBinaryInMemCtx: memCtx];
*data = [content asBinaryInMemCtx: memCtx];
}
else
{