xserver: Branch 'master'

[Matthias Hopf]

 hw/xfree86/common/xf86Config.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 26d2e45bdb0cf4d18ba7b0365425da49d60b3d5c (from a724b7f1302ba7a59f140b521f13d2ddf0fcf9bf)
Author: Matthias Hopf <mhopf at suse.de>
Date:   Tue Nov 14 15:33:07 2006 +0100

    Bug #9023: Only check mice for "mouse" or "void" if identifier is != NULL.

diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index ffdca12..c0e21dd 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -1307,7 +1307,7 @@ checkCoreInputDevices(serverLayoutPtr se
      * events, unless a 'void' section is found, in which case the user
      * probably wants to run footless.
      */
-    for (i = servlayoutp->inputs; i->driver; i++) {
+    for (i = servlayoutp->inputs; i->identifier && i->driver; i++) {
 	if (!strcmp(i->driver, "void") || !strcmp(i->driver, "mouse")) {
 	    found = 1; break;
 	}