oc: Check PidTagObjectType before dereferencing on ModifyRecipients

This is crashing when the PidTagObjectType property is set for
some recipient and not for others.

If the property is missing, then no object type for the recipient
is assumed.
This commit is contained in:
Enrique J. Hernández Blasco
2015-06-29 23:50:55 +02:00
parent c1b0fd53dc
commit 62b16f4ef3
+3 -2
View File
@@ -202,7 +202,8 @@ rtf2html (NSData *compressedRTF)
email = recipient->data[count];
break;
case PidTagObjectType:
object_type = *((uint8_t*) recipient->data[count]);
if (recipient->data[count])
object_type = *((uint8_t*) recipient->data[count]);
break;
case PidTagSmtpAddress:
smtpAddress = recipient->data[count];
@@ -229,7 +230,7 @@ rtf2html (NSData *compressedRTF)
if (object_type == MAPI_MAILUSER && recipient->username)
{
/* values from user object have priority uppon the data passed for the client */
/* values from user object have priority over data sent by the client */
recipientUser = [SOGoUser userWithLogin: [value lowercaseString]];
if (recipientUser)
{