aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Hoa V. DINH <dinh.viet.hoa@gmail.com>2015-05-08 07:34:10 -0700
committerGravatar Hoa V. DINH <dinh.viet.hoa@gmail.com>2015-05-08 07:34:19 -0700
commit640d1945f279038c197e31419677ac64e4246453 (patch)
treee78e49c876fa441cd11f727b21b4de607334631a
parent6c5c219d270c4d5e4d8e856e4dd03d78285e0bc6 (diff)
Return empty string if list of addresses is empty
-rw-r--r--src/core/abstract/MCAddress.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/core/abstract/MCAddress.cpp b/src/core/abstract/MCAddress.cpp
index 98b4d8ec..335bc68b 100644
--- a/src/core/abstract/MCAddress.cpp
+++ b/src/core/abstract/MCAddress.cpp
@@ -213,6 +213,9 @@ Array * Address::addressesWithNonEncodedRFC822String(String * string)
String * Address::RFC822StringForAddresses(Array * addresses)
{
String * result = String::string();
+ if (addresses == NULL) {
+ return result;
+ }
for(unsigned int i = 0 ; i < addresses->count() ; i ++) {
Address * address = (Address *) addresses->objectAtIndex(i);
if (i != 0) {
@@ -226,6 +229,9 @@ String * Address::RFC822StringForAddresses(Array * addresses)
String * Address::nonEncodedRFC822StringForAddresses(Array * addresses)
{
String * result = String::string();
+ if (addresses == NULL) {
+ return result;
+ }
for(unsigned int i = 0 ; i < addresses->count() ; i ++) {
Address * address = (Address *) addresses->objectAtIndex(i);
if (i != 0) {