NetworkManager r4024 - in trunk/vpn-daemons/vpnc: . auth-dialog

[dcbw svn gnome org]

Author: dcbw
Date: Thu Aug 28 15:39:02 2008
New Revision: 4024
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=4024&view=rev

Log:
2008-08-28  Dan Williams  <dcbw redhat com>

	* 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)



Modified:
   trunk/vpn-daemons/vpnc/ChangeLog
   trunk/vpn-daemons/vpnc/auth-dialog/main.c

Modified: trunk/vpn-daemons/vpnc/auth-dialog/main.c
==============================================================================
--- trunk/vpn-daemons/vpnc/auth-dialog/main.c	(original)
+++ trunk/vpn-daemons/vpnc/auth-dialog/main.c	Thu Aug 28 15:39:02 2008
@@ -198,7 +198,7 @@
 		*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 @@
 	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 */