From 4d94a067247e11f8fd1c2de0427f636c7c8e9ec9 Mon Sep 17 00:00:00 2001 From: Johnny Jacob Date: Fri, 25 Jan 2008 12:33:56 +0000 Subject: Fix for #503327 : Fixes memory leaks and a buffer overflow in attachment reminder. svn path=/trunk/; revision=34890 --- composer/ChangeLog | 7 +++++++ composer/e-msg-composer.c | 4 ++-- composer/e-msg-composer.h | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) (limited to 'composer') diff --git a/composer/ChangeLog b/composer/ChangeLog index e902007906..523164bdbc 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,10 @@ +2008-01-25 Johnny Jacob + + ** Fixes bug #503327 & #503678 + + * e-msg-composer.c (e_msg_composer_get_raw_message_text): Return + GByteArray instead of gchar* + 2008-01-24 Matthew Barnes ** Fixes bug #509124 diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index f0bb36633f..56035b1aea 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -6262,7 +6262,7 @@ e_msg_composer_unset_autosaved (EMsgComposer *composer) * * Returns the text/plain of the message from composer **/ -const gchar * +GByteArray * e_msg_composer_get_raw_message_text (EMsgComposer *composer) { GByteArray *data = NULL; @@ -6271,7 +6271,7 @@ e_msg_composer_get_raw_message_text (EMsgComposer *composer) data = get_text (p->persist_stream_interface, "text/plain"); if (data) - return (const gchar *)data->data; + return data; return NULL; } diff --git a/composer/e-msg-composer.h b/composer/e-msg-composer.h index 19e84170e4..a6c8e719fc 100644 --- a/composer/e-msg-composer.h +++ b/composer/e-msg-composer.h @@ -192,7 +192,7 @@ EMsgComposerHdrs* e_msg_composer_get_hdrs (EMsgComposer *composer); void e_msg_composer_set_saved (EMsgComposer *composer); void e_msg_composer_set_send_options (EMsgComposer *composer, gboolean send_enable); -const gchar * e_msg_composer_get_raw_message_text (EMsgComposer *composer); +GByteArray * e_msg_composer_get_raw_message_text (EMsgComposer *composer); struct _EAttachmentBar* e_msg_composer_get_attachment_bar (EMsgComposer *composer); -- cgit