From 00129b3b39ff076f3925d550dff3580e4854a43f Mon Sep 17 00:00:00 2001 From: Ken Grigsby Date: Thu, 20 Jun 2013 11:10:34 -0500 Subject: Fix crash in recipientWithReplyAll when mCc is NULL --- src/core/abstract/MCMessageHeader.cc | 44 ++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/src/core/abstract/MCMessageHeader.cc b/src/core/abstract/MCMessageHeader.cc index e0476743..3a2a5872 100644 --- a/src/core/abstract/MCMessageHeader.cc +++ b/src/core/abstract/MCMessageHeader.cc @@ -1153,26 +1153,30 @@ Array * MessageHeader::recipientWithReplyAll(bool replyAll, bool includeTo, bool Array * recipient; recipient = new Array(); - for(unsigned int i = 0 ; i < to()->count() ; i ++) { - Address * address = (Address *) to()->objectAtIndex(i); - if (addedAddresses->containsObject(address->mailbox()->lowercaseString())) { - continue; - } - if (address->mailbox() == NULL) - continue; - recipient->addObject(address); - addedAddresses->addObject(address->mailbox()->lowercaseString()); - } - for(unsigned int i = 0 ; i < cc()->count() ; i ++) { - Address * address = (Address *) cc()->objectAtIndex(i); - if (addedAddresses->containsObject(address->mailbox()->lowercaseString())) { - continue; - } - if (address->mailbox() == NULL) - continue; - recipient->addObject(address); - addedAddresses->addObject(address->mailbox()->lowercaseString()); - } + if (to() != NULL) { + for(unsigned int i = 0 ; i < to()->count() ; i ++) { + Address * address = (Address *) to()->objectAtIndex(i); + if (addedAddresses->containsObject(address->mailbox()->lowercaseString())) { + continue; + } + if (address->mailbox() == NULL) + continue; + recipient->addObject(address); + addedAddresses->addObject(address->mailbox()->lowercaseString()); + } + } + if (cc() != NULL) { + for(unsigned int i = 0 ; i < cc()->count() ; i ++) { + Address * address = (Address *) cc()->objectAtIndex(i); + if (addedAddresses->containsObject(address->mailbox()->lowercaseString())) { + continue; + } + if (address->mailbox() == NULL) + continue; + recipient->addObject(address); + addedAddresses->addObject(address->mailbox()->lowercaseString()); + } + } if (recipient->count() > 0) { hasCc = true; } -- cgit v1.2.3