aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorJohnny Jacob <jjohnny@src.gnome.org>2008-01-25 20:33:56 +0800
committerJohnny Jacob <jjohnny@src.gnome.org>2008-01-25 20:33:56 +0800
commit4d94a067247e11f8fd1c2de0427f636c7c8e9ec9 (patch)
treee25bda2c0fa6c6c6e3aac5312496d252c1407fe8 /plugins
parentcdb4925134bd6fdf61bd58a7e43f60d343d8606d (diff)
downloadgsoc2013-evolution-4d94a067247e11f8fd1c2de0427f636c7c8e9ec9.tar
gsoc2013-evolution-4d94a067247e11f8fd1c2de0427f636c7c8e9ec9.tar.gz
gsoc2013-evolution-4d94a067247e11f8fd1c2de0427f636c7c8e9ec9.tar.bz2
gsoc2013-evolution-4d94a067247e11f8fd1c2de0427f636c7c8e9ec9.tar.lz
gsoc2013-evolution-4d94a067247e11f8fd1c2de0427f636c7c8e9ec9.tar.xz
gsoc2013-evolution-4d94a067247e11f8fd1c2de0427f636c7c8e9ec9.tar.zst
gsoc2013-evolution-4d94a067247e11f8fd1c2de0427f636c7c8e9ec9.zip
Fix for #503327 : Fixes memory leaks and a buffer overflow in attachment reminder.
svn path=/trunk/; revision=34890
Diffstat (limited to 'plugins')
-rw-r--r--plugins/attachment-reminder/ChangeLog8
-rw-r--r--plugins/attachment-reminder/attachment-reminder.c25
2 files changed, 26 insertions, 7 deletions
diff --git a/plugins/attachment-reminder/ChangeLog b/plugins/attachment-reminder/ChangeLog
index 8f56be90f9..a8cdf93a9f 100644
--- a/plugins/attachment-reminder/ChangeLog
+++ b/plugins/attachment-reminder/ChangeLog
@@ -1,3 +1,11 @@
+2008-01-24 Johnny Jacob <jjohnny@novell.com>
+
+ ** Fixes bug #503327 & #503678
+
+ * attachment-reminder.c (strip_text_msg): Memory leak Fix.
+ (org_gnome_evolution_attachment_reminder): Free GByteArray.
+ NULL terminate string.
+
2008-01-14 Kjartan Maraas <kmaraas@gnome.org>
* apps-evolution-attachment-reminder.schemas.in: Add
diff --git a/plugins/attachment-reminder/attachment-reminder.c b/plugins/attachment-reminder/attachment-reminder.c
index 6bbf4d0e00..b50fc5b9dc 100644
--- a/plugins/attachment-reminder/attachment-reminder.c
+++ b/plugins/attachment-reminder/attachment-reminder.c
@@ -94,7 +94,9 @@ void
org_gnome_evolution_attachment_reminder (EPlugin *ep, EMEventTargetComposer *t)
{
GConfClient *gconf;
- char *rawstr = NULL, *filtered_str = NULL;
+ GByteArray *raw_msg_barray;
+
+ gchar *filtered_str = NULL;
gconf = gconf_client_get_default ();
if (!gconf_client_get_bool (gconf, GCONF_KEY_ATTACHMENT_REMINDER, NULL)){
@@ -103,11 +105,15 @@ org_gnome_evolution_attachment_reminder (EPlugin *ep, EMEventTargetComposer *t)
} else
g_object_unref (gconf);
- rawstr = g_strdup (e_msg_composer_get_raw_message_text (t->composer));
+ raw_msg_barray = e_msg_composer_get_raw_message_text (t->composer);
+
+ if (!raw_msg_barray)
+ return;
- filtered_str = strip_text_msg (rawstr);
+ raw_msg_barray = g_byte_array_append (raw_msg_barray, (const guint8 *)"", 1);
- g_free (rawstr);
+ filtered_str = strip_text_msg (raw_msg_barray->data);
+ g_byte_array_free (raw_msg_barray, TRUE);
/* Set presend_check_status for the composer*/
if (check_for_attachment_clues (filtered_str) && !check_for_attachment (t->composer))
@@ -136,6 +142,7 @@ check_for_attachment_clues (gchar *msg)
gconf = gconf_client_get_default ();
+
/* Get the list from gconf */
clue_list = gconf_client_get_list ( gconf, GCONF_KEY_ATTACH_REMINDER_CLUES, GCONF_VALUE_STRING, NULL );
@@ -176,12 +183,13 @@ strip_text_msg (gchar *msg)
{
gchar **lines = g_strsplit ( msg, "\n", -1);
gchar *stripped_msg = g_strdup (" ");
-
guint i=0;
+ gchar *temp;
while (lines [i]){
if (lines [i] != NULL && !g_str_has_prefix (g_strstrip(lines[i]), ">")){
- gchar *temp = stripped_msg;
+ temp = stripped_msg;
+
stripped_msg = g_strconcat (" ", stripped_msg, lines[i], NULL);
g_free (temp);
@@ -191,7 +199,10 @@ strip_text_msg (gchar *msg)
g_strfreev (lines);
- return g_utf8_strdown (stripped_msg, -1);
+ temp = g_utf8_strdown (stripped_msg, -1);
+ g_free (stripped_msg);
+
+ return temp;
}
static void