diff options
| author |  Ryan Walklin <ryan@testtoast.com> | 2013-09-06 13:34:18 +1200 |
|---|---|---|
| committer | Ryan Walklin <ryan@testtoast.com> | 2013-09-06 13:34:18 +1200 |
| commit | 9f12bfcaad24883e392a10d88b9f8745c9591a29 (patch) | |
| tree | 7ce61de9f69412927e292692ef65dfc082f38b17 /src/objc | |
| parent | 755d656cc5e5119e44d6250efbd97cf388a44433 (diff) | |
| parent | a761dd21e83b9addd82acc3daf1c855c6d3942f5 (diff) | |
Merge branch 'master' of https://github.com/MailCore/mailcore2
Diffstat (limited to 'src/objc')
| -rw-r--r-- | src/objc/abstract/MCOAddress.mm | 12 | ||||
| -rw-r--r-- | src/objc/utils/NSError+MCO.mm | 4 |
2 files changed, 16 insertions, 0 deletions
diff --git a/src/objc/abstract/MCOAddress.mm b/src/objc/abstract/MCOAddress.mm index 5dd29184..4bdcea03 100644 --- a/src/objc/abstract/MCOAddress.mm +++ b/src/objc/abstract/MCOAddress.mm @@ -54,6 +54,9 @@ MCO_SYNTHESIZE_NSCODING MCOAddress * result = [[[MCOAddress alloc] init] autorelease]; MC_SAFE_RELEASE(result->_nativeAddress); result->_nativeAddress = mailcore::Address::addressWithDisplayName([displayName mco_mcString], [mailbox mco_mcString]); + if (!result->_nativeAddress) { + return NULL; + } result->_nativeAddress->retain(); return result; } @@ -63,6 +66,9 @@ MCO_SYNTHESIZE_NSCODING MCOAddress * result = [[[MCOAddress alloc] init] autorelease]; MC_SAFE_RELEASE(result->_nativeAddress); result->_nativeAddress = mailcore::Address::addressWithMailbox([mailbox mco_mcString]); + if (!result->_nativeAddress) { + return NULL; + } result->_nativeAddress->retain(); return result; } @@ -72,6 +78,9 @@ MCO_SYNTHESIZE_NSCODING MCOAddress * result = [[[MCOAddress alloc] init] autorelease]; MC_SAFE_RELEASE(result->_nativeAddress); result->_nativeAddress = mailcore::Address::addressWithRFC822String([RFC822String mco_mcString]); + if (!result->_nativeAddress) { + return NULL; + } result->_nativeAddress->retain(); return result; } @@ -81,6 +90,9 @@ MCO_SYNTHESIZE_NSCODING MCOAddress * result = [[[MCOAddress alloc] init] autorelease]; MC_SAFE_RELEASE(result->_nativeAddress); result->_nativeAddress = mailcore::Address::addressWithNonEncodedRFC822String([nonEncodedRFC822String mco_mcString]); + if (!result->_nativeAddress) { + return NULL; + } result->_nativeAddress->retain(); return result; } diff --git a/src/objc/utils/NSError+MCO.mm b/src/objc/utils/NSError+MCO.mm index 47abf809..b8ab06e9 100644 --- a/src/objc/utils/NSError+MCO.mm +++ b/src/objc/utils/NSError+MCO.mm @@ -43,6 +43,10 @@ static NSString * MCOLocalizedDescriptionTable[] = { @"An error occured while fetching a message list on the POP server.", /** MCOErrorFetchMessageList */ @"An error occured while deleting a message on the POP server.", /** MCOErrorDeleteMessage */ @"Account check failed because the account is invalid.", /** MCOErrorInvalidAccount */ + @"File access error", /** MCOErrorFile */ + @"Compression is not available", /** MCOErrorCompression */ + @"A sender is required to send message", /** MCOErrorNoSender */ + @"A recipient is required to send message", /** MCOErrorNoRecipient */ }; @implementation NSError (MCO) |