diff options
| author |  Yuk Lai Suen <yuklai@hothouselabs.com> | 2013-09-05 13:50:37 -0700 |
|---|---|---|
| committer | Yuk Lai Suen <yuklai@hothouselabs.com> | 2013-09-05 13:50:37 -0700 |
| commit | 064a7bca0535cfdff2fef5987c0b22e4c6d8b765 (patch) | |
| tree | 9dbe0c14fe4185a177d1cf5a8416e7dc06cdddff /src | |
| parent | 4711caf2a47131473b80848554aae295c94b6579 (diff) | |
Check for NULL in MCOAddress string functions before retain
Diffstat (limited to 'src')
| -rw-r--r-- | src/objc/abstract/MCOAddress.mm | 12 |
1 files changed, 12 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; } |