[Commits] [SCM] claws branch, vfolder, updated. 3.10.1-114-g7d7028f

miras at claws-mail.org miras at claws-mail.org
Mon Jun 23 01:08:04 CEST 2014


The branch vfolder of project "claws" (Claws Mail) has been updated
       via  7d7028fa1195758575a43ceae45cbcea9d006e0d (commit)
      from  d28033a73faaeeea87ed7befe9fcca19c38a727a (commit)

Summary of changes:
 src/plugins/vfolder/vfolder_prop.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit 7d7028fa1195758575a43ceae45cbcea9d006e0d
Author: Michael Rasmussen <mir at datanom.net>
Date:   Mon Jun 23 01:08:00 2014 +0200

    Fix potential memory leak

diff --git a/src/plugins/vfolder/vfolder_prop.c b/src/plugins/vfolder/vfolder_prop.c
index 59c4f46..6a3ba36 100644
--- a/src/plugins/vfolder/vfolder_prop.c
+++ b/src/plugins/vfolder/vfolder_prop.c
@@ -279,7 +279,7 @@ gboolean vfolder_edit_item_dialog(VFolderItem** vitem_ptr, FolderItem* item) {
 	GtkWidget* row;
 	GtkWidget* box;
 	gint response;
-	gchar *name, *id;
+	gchar *name = NULL, *id = NULL;
 	const gchar* str;
 	gboolean frozen;
 	gchar* old_filter = NULL;
@@ -393,7 +393,6 @@ gboolean vfolder_edit_item_dialog(VFolderItem** vitem_ptr, FolderItem* item) {
 		debug_print("VFolder name from dialog: %s\n", str);
 		if (! str) goto error;
 
-		name = NULL;
 		if (vitem)
 			name = folder_item_get_name(FOLDER_ITEM(vitem));
 		debug_print("VFolder name from VFolder: %s\n", name ? name : "NULL");
@@ -419,7 +418,6 @@ gboolean vfolder_edit_item_dialog(VFolderItem** vitem_ptr, FolderItem* item) {
 				debug_print("Rename VFolder to: %s\n", str);
 				folder_item_rename(FOLDER_ITEM(vitem), (gchar *) str);
 			}
-			g_free(name);
 		}
 
 		frozen = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(props_dialog->frozen));
@@ -517,6 +515,7 @@ error:
 	gtk_widget_destroy(dialog);
 	g_free(props_dialog);
 	g_free(old_filter);
+	g_free(name);
 
 	return ok;
 }

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list