evolution r34883 - trunk/composer

[mbarnes svn gnome org]

Author: mbarnes
Date: Thu Jan 24 12:43:12 2008
New Revision: 34883
URL: http://svn.gnome.org/viewvc/evolution?rev=34883&view=rev

Log:
2008-01-24  Matthew Barnes  <mbarnes redhat com>

	** Fixes bug #509124

	* composer/e-msg-composer.c (e_msg_composer_get_message_print),
	(e_msg_composer_get_message_draft):
	Check result of build_message() for NULL before proceeding.



Modified:
   trunk/composer/ChangeLog
   trunk/composer/e-msg-composer.c

Modified: trunk/composer/e-msg-composer.c
==============================================================================
--- trunk/composer/e-msg-composer.c	(original)
+++ trunk/composer/e-msg-composer.c	Thu Jan 24 12:43:12 2008
@@ -5276,6 +5276,9 @@
 	GString *flags;
 
 	msg = build_message (composer, save_html_object_data);
+	if (msg == NULL)
+		return NULL;
+
 	temp_composer = e_msg_composer_new_with_message (msg);
 	camel_object_unref (msg);
 
@@ -5302,8 +5305,10 @@
 	temp_composer->priv->smime_encrypt = FALSE;
 
 	msg = build_message (temp_composer, save_html_object_data);
-	camel_medium_set_header (CAMEL_MEDIUM (msg),
-		"X-Evolution-Format", flags->str);
+	if (msg != NULL)
+		camel_medium_set_header (
+			CAMEL_MEDIUM (msg),
+			"X-Evolution-Format", flags->str);
 
 	e_msg_composer_delete (temp_composer);
 	g_string_free (flags, TRUE);
@@ -5335,6 +5340,8 @@
 	p->smime_encrypt = FALSE;
 
 	msg = build_message (composer, TRUE);
+	if (msg == NULL)
+		return NULL;
 
 	p->send_html = old_send_html;
 	p->pgp_sign = old_flags[0];