From: Alberto Garcia <agarcia@igalia.com>
Date: Tue, 4 Dec 2007 10:34:15 +0000 (+0000)
Subject: Check for NULL in tny_header_get_message_id()
X-Git-Tag: git_migration_finished~1977
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=0c33e62765906c36435deea78e477f47b045c6c4

Check for NULL in tny_header_get_message_id()

pmo-trunk-r3860
---

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index 547c959..45a5455 100644
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -673,11 +673,15 @@ send_mail_msg_sent_handler (TnySendQueue *queue, TnyHeader *header, TnyMsg *msg,
 {
 	SendMsgInfo *info = (SendMsgInfo *) userdata;
 	TnyHeader *hdr1, *hdr2;
+	const char *msgid1, *msgid2;
 	hdr1 = tny_msg_get_header(msg);
 	hdr2 = tny_msg_get_header(info->msg);
+	msgid1 = tny_header_get_message_id(hdr1);
+	msgid2 = tny_header_get_message_id(hdr2);
+	if (msgid1 == NULL) msgid1 = "(null)";
+	if (msgid2 == NULL) msgid2 = "(null)";
 
-	if (!strcmp (tny_header_get_message_id(hdr1),
-		     tny_header_get_message_id(hdr2))) {
+	if (!strcmp (msgid1, msgid2)) {
 		ModestMailOperationPrivate *priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op);
 		priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
 
@@ -695,9 +699,15 @@ send_mail_error_happened_handler (TnySendQueue *queue, TnyHeader *header, TnyMsg
 	TnyHeader *hdr1, *hdr2;
 	hdr1 = tny_msg_get_header(msg);
 	hdr2 = tny_msg_get_header(info->msg);
+	const char *msgid1, *msgid2;
+	hdr1 = tny_msg_get_header(msg);
+	hdr2 = tny_msg_get_header(info->msg);
+	msgid1 = tny_header_get_message_id(hdr1);
+	msgid2 = tny_header_get_message_id(hdr2);
+	if (msgid1 == NULL) msgid1 = "(null)";
+	if (msgid2 == NULL) msgid2 = "(null)";
 
-	if (!strcmp (tny_header_get_message_id(hdr1),
-		     tny_header_get_message_id(hdr2))) {
+	if (!strcmp (msgid1, msgid2)) {
 		ModestMailOperationPrivate *priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op);
 		priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
 		g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,