gdm r5935 - in trunk: . common

[mccann svn gnome org]

Author: mccann
Date: Thu Mar  6 01:30:25 2008
New Revision: 5935
URL: http://svn.gnome.org/viewvc/gdm?rev=5935&view=rev

Log:
2008-03-05  William Jon McCann  <jmccann redhat com>

	* common/gdm-settings-desktop-backend.c:
	Don't allow empty strings for keys.



Modified:
   trunk/ChangeLog
   trunk/common/gdm-settings-desktop-backend.c

Modified: trunk/common/gdm-settings-desktop-backend.c
==============================================================================
--- trunk/common/gdm-settings-desktop-backend.c	(original)
+++ trunk/common/gdm-settings-desktop-backend.c	Thu Mar  6 01:30:25 2008
@@ -80,7 +80,12 @@
         /*g_debug ("Attempting to parse key string: %s", keystring);*/
 
         split1 = g_strsplit (keystring, "/", 2);
-        if (split1 == NULL || split1 [0] == NULL || split1 [1] == NULL) {
+        if (split1 == NULL
+            || split1 [0] == NULL
+            || split1 [1] == NULL
+            || split1 [0][0] == '\0'
+            || split1 [1][0] == '\0') {
+                g_warning ("GdmSettingsDesktopBackend: invalid key: %s", keystring);
                 goto out;
         }