From 2138c33d2a14dadee03b86cc1b62124e5fca5af5 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 28 Aug 2008 15:39:02 +0000 Subject: [PATCH] 2008-08-28 Dan Williams * auth-dialog/main.c - (get_secrets): don't gtk_widget_show_all() because that exposes widgets that were supposed to be hidden - (main): don't segfault on missing passwords (like hitting Cancel) git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@4024 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- vpn-daemons/vpnc/ChangeLog | 7 +++++++ vpn-daemons/vpnc/auth-dialog/main.c | 14 +++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/vpn-daemons/vpnc/ChangeLog b/vpn-daemons/vpnc/ChangeLog index e896fe10f4..6185b90914 100644 --- a/vpn-daemons/vpnc/ChangeLog +++ b/vpn-daemons/vpnc/ChangeLog @@ -1,3 +1,10 @@ +2008-08-28 Dan Williams + + * auth-dialog/main.c + - (get_secrets): don't gtk_widget_show_all() because that exposes + widgets that were supposed to be hidden + - (main): don't segfault on missing passwords (like hitting Cancel) + 2008-08-26 Dan Williams * auth-dialog/main.c diff --git a/vpn-daemons/vpnc/auth-dialog/main.c b/vpn-daemons/vpnc/auth-dialog/main.c index b5caf0130f..442de698f6 100644 --- a/vpn-daemons/vpnc/auth-dialog/main.c +++ b/vpn-daemons/vpnc/auth-dialog/main.c @@ -198,7 +198,7 @@ get_secrets (const char *vpn_uuid, *group_password = NULL; } - gtk_widget_show_all (GTK_WIDGET (dialog)); + gtk_widget_show (GTK_WIDGET (dialog)); if (gnome_two_password_dialog_run_and_block (dialog)) { *password = gnome_two_password_dialog_get_password (dialog); @@ -276,10 +276,14 @@ main (int argc, char *argv[]) printf ("%s\n%s\n", NM_VPNC_KEY_SECRET, group_password); printf ("\n\n"); - memset (password, 0, strlen (password)); - g_free (password); - memset (group_password, 0, strlen (group_password)); - g_free (group_password); + if (password) { + memset (password, 0, strlen (password)); + g_free (password); + } + if (group_password) { + memset (group_password, 0, strlen (group_password)); + g_free (group_password); + } exit_status = 0; /* for good measure, flush stdout since Kansas is going Bye-Bye */