Re: [evolution-patches] Evolution - mail, fixes a multiple free in folder ops.



Hi,

Modified and attached the patch.

Thanks,
Arunprakash.

On Fri, 2005-07-29 at 16:39 +0800, Not Zed wrote:
> 
> No need for the temporary variable.
> 
> g_object_set_data_full(..., "full_name",
> g_strudup(folder->full_name) ... etc)
> 
> will suffice.
> 
> On Fri, 2005-07-29 at 13:55 +0530, Arunprakash wrote:
> > -       g_object_set_data_full ((GObject *) dialog, "full_name",
> > folder->full_name, g_free);
> > +       folder_name = g_strdup (folder->full_name);
> > +       g_object_set_data_full ((GObject *) dialog, "full_name",
> > folder_name, g_free); 
> 
Index: mail/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3667
diff -u -p -r1.3667 ChangeLog
--- mail/ChangeLog	29 Jul 2005 06:55:36 -0000	1.3667
+++ mail/ChangeLog	1 Aug 2005 03:45:10 -0000
@@ -1,3 +1,9 @@
+2005-07-29  Arunprakash <arunp novell com>
+
+	* mail/em-folder-utils.c (em_folder_utils_delete_folder) : Allocated
+	a new string to be used for the error dialog response to avoid
+	multiple frees.
+	
 2005-07-29  Shreyas Srinivasan  <sshreyas novell com>
 
 	* mail-ops.c: Fix #311223. Include <camel/camel-multipart.h>
Index: mail/em-folder-utils.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-folder-utils.c,v
retrieving revision 1.4
diff -u -p -r1.4 em-folder-utils.c
--- mail/em-folder-utils.c	21 Jul 2005 04:15:21 -0000	1.4
+++ mail/em-folder-utils.c	1 Aug 2005 03:45:12 -0000
@@ -481,7 +481,7 @@ em_folder_utils_delete_folder (CamelFold
 	dialog = e_error_new(NULL,
 			     (folder->parent_store && CAMEL_IS_VEE_STORE(folder->parent_store))?"mail:ask-delete-vfolder":"mail:ask-delete-folder",
 			     folder->full_name, NULL);
-	g_object_set_data_full ((GObject *) dialog, "full_name", folder->full_name, g_free);
+	g_object_set_data_full ((GObject *) dialog, "full_name", g_strdup (folder->full_name), g_free);
 	g_object_set_data_full ((GObject *) dialog, "store", folder->parent_store, camel_object_unref);
 	g_signal_connect (dialog, "response", G_CALLBACK (emfu_delete_response), NULL);
 	gtk_widget_show (dialog);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]