gnome-settings-daemon r707 - in trunk: . plugins/common

[jensg svn gnome org]

Author: jensg
Date: Wed Feb 11 20:47:40 2009
New Revision: 707
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=707&view=rev

Log:
2009-02-11  Jens Granseuer  <jensgr gmx net>

	* plugins/common/eggaccelerators.c:
	(egg_accelerator_parse_virtual): don't return TRUE if we can't parse
	the accelerator at all; fixes crash with invalid keyboard shortuts
	(bug #571329)


Modified:
   trunk/ChangeLog
   trunk/plugins/common/eggaccelerators.c

Modified: trunk/plugins/common/eggaccelerators.c
==============================================================================
--- trunk/plugins/common/eggaccelerators.c	(original)
+++ trunk/plugins/common/eggaccelerators.c	Wed Feb 11 20:47:40 2009
@@ -358,6 +358,10 @@
 		      }
 		    }
 		}
+	      else
+		{
+		  bad_keyval = TRUE;
+		}
 	    }
 	  else if (accelerator_codes != NULL)
 	    {