diff options
| -rw-r--r-- | composer/e-msg-composer.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index c9edee6907..266009b114 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -266,13 +266,25 @@ build_message (EMsgComposer *composer) } plain = get_text (composer->persist_stream_interface, "text/plain"); + + /* the component has probably died */ + if (plain == NULL) + return NULL; + fmt = format_text (plain); e8bit = is_8bit (fmt); g_free (plain); - if (type != MSG_FORMAT_PLAIN) + if (type != MSG_FORMAT_PLAIN) { html = get_text (composer->persist_stream_interface, "text/html"); - + + /* the component has probably died */ + if (html == NULL) { + g_free (fmt); + return NULL; + } + } + if (type == MSG_FORMAT_ALTERNATIVE) { body = camel_multipart_new (); camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (body), |