X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=blobdiff_plain;f=src%2Faddr_compl.c;h=1ee3a7dff9b2454cb70e390cb3bf7a517253293d;hp=f6884235c8ea619e432b761cc5cc0b69add401af;hb=7f0ae644cf0e885d81563153948c925ef5c24151;hpb=239f8bb0a79484881dfc12f67f2006bcbc7f5023

diff --git a/src/addr_compl.c b/src/addr_compl.c
index f6884235c..1ee3a7dff 100644
--- a/src/addr_compl.c
+++ b/src/addr_compl.c
@@ -288,6 +288,7 @@ gchar *get_address_from_edit(GtkEntry *entry, gint *start_pos)
 void replace_address_in_edit(GtkEntry *entry, const gchar *newtext,
 			     gint start_pos)
 {
+	if (!newtext) return;
 	gtk_editable_delete_text(GTK_EDITABLE(entry), start_pos, -1);
 	gtk_editable_insert_text(GTK_EDITABLE(entry), newtext, strlen(newtext),
 				 &start_pos);
@@ -869,6 +870,7 @@ static gboolean completion_window_button_press(GtkWidget *widget,
 		prefix = get_complete_address(0);
 		g_free(get_address_from_edit(GTK_ENTRY(entry), &cursor_pos));
 		replace_address_in_edit(GTK_ENTRY(entry), prefix, cursor_pos);
+		g_free(prefix);
 	}
 
 	clear_completion_cache();