xserver: Branch 'master'

[Matthieu Herrb]

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

New commits:
commit c70511931ca1441878daed50e710fa514f6ab077
Author: Matthieu Herrb <matthieu.herrb at laas.fr>
Date:   Sun May 24 10:32:38 2009 +0200

    fix typo in cabff9007 which led to an unintialized memory read and a crash.

diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 165958b..24049aa 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -1226,7 +1226,7 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
 	const char **driver = mousedrivers;
 	confInput = xf86findInput(CONF_IMPLICIT_POINTER,
 				  xf86configptr->conf_input_lst);
-	while (driver && !confInput) {
+	while (*driver && !confInput) {
 	    confInput = xf86findInputByDriver(*driver,
 					      xf86configptr->conf_input_lst);
 	    driver++;