talons

commit 667a3121702bd86d385ccd706e054422b126dd26
parent 483f9b039ebac3c95313b596df060571f5f00840
Author: Colin Leroy <colin@colino.net>
Date:   Thu, 11 Feb 2016 10:25:06 +0100

Fix a leak and g_log() in case of null passwords

Diffstat:
M
src/prefs_gtk.c
 | 
6
++++--

1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/prefs_gtk.c b/src/prefs_gtk.c
@@ -668,7 +668,7 @@ void prefs_set_escaped_data_from_entry(PrefParam *pparam)
 void prefs_set_entry(PrefParam *pparam)
 {
 	gchar **str;
-
+    char *decrypted_pass = NULL;
 	cm_return_if_fail(*pparam->widget != NULL);
 
 	switch (pparam->type) {
@@ -687,8 +687,10 @@ void prefs_set_entry(PrefParam *pparam)
 		break;
 	case P_PASSWORD:
 		str = (gchar **)pparam->data;
+        decrypted_pass = password_decrypt(*str, NULL);
 		gtk_entry_set_text(GTK_ENTRY(*pparam->widget),
-				password_decrypt(*str, NULL));
+				(decrypted_pass != NULL ? decrypted_pass : ""));
+        g_free(decrypted_pass);
 		break;
 	default:
 		g_warning("Invalid PrefType for GtkEntry widget: %d",