almanah r113 - in trunk: . src

[pwithnall svn gnome org]

Author: pwithnall
Date: Sun Nov 16 21:49:39 2008
New Revision: 113
URL: http://svn.gnome.org/viewvc/almanah?rev=113&view=rev

Log:
2008-11-16  Philip Withnall  <philip tecnocode co uk>

	* src/preferences-dialog.c (almanah_preferences_dialog_new):
	Fix a crash caused by dereferencing a NULL pointer.



Modified:
   trunk/ChangeLog
   trunk/src/preferences-dialog.c

Modified: trunk/src/preferences-dialog.c
==============================================================================
--- trunk/src/preferences-dialog.c	(original)
+++ trunk/src/preferences-dialog.c	Sun Nov 16 21:49:39 2008
@@ -165,7 +165,7 @@
 
 	/* Set the selected key combo value */
 	key = gconf_client_get_string (almanah->gconf_client, ENCRYPTION_KEY_GCONF_PATH, NULL);
-	if (*key == '\0') {
+	if (key != NULL && *key == '\0') {
 		g_free (key);
 		key = NULL;
 	}