From 6d899008caecfa37ddd6ee4e0b267520854cb5e3 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Fri, 5 Dec 2014 21:56:54 -0500 Subject: [PATCH] Improve SOGoDraftObject to avoid crash when saving --- SoObjects/Mailer/SOGoDraftObject.m | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m index 6967a6262..bb7a04433 100644 --- a/SoObjects/Mailer/SOGoDraftObject.m +++ b/SoObjects/Mailer/SOGoDraftObject.m @@ -1597,17 +1597,16 @@ static NSString *userAgent = nil; { NSString *s, *dateString; NGMutableHashMap *map; - NSArray *emails; - id from, replyTo; + id emails, from, replyTo; map = [[[NGMutableHashMap alloc] initWithCapacity:16] autorelease]; /* add recipients */ - if ((emails = [headers objectForKey: @"to"]) != nil) + if ((emails = [headers objectForKey: @"to"]) != nil && [emails isKindOfClass: [NSArray class]]) [map setObjects: [self _quoteSpecialsInArray: emails] forKey: @"to"]; - if ((emails = [headers objectForKey: @"cc"]) != nil) + if ((emails = [headers objectForKey: @"cc"]) != nil && [emails isKindOfClass: [NSArray class]]) [map setObjects: [self _quoteSpecialsInArray: emails] forKey: @"cc"]; - if ((emails = [headers objectForKey: @"bcc"]) != nil) + if ((emails = [headers objectForKey: @"bcc"]) != nil && [emails isKindOfClass: [NSArray class]]) [map setObjects: [self _quoteSpecialsInArray: emails] forKey: @"bcc"]; /* add senders */