Don't crash the server on Xorg -configure
authorJulien Cristau <jcristau@debian.org>
Tue, 13 Jul 2010 10:57:15 +0000 (11:57 +0100)
committerJulien Cristau <jcristau@debian.org>
Tue, 13 Jul 2010 10:57:15 +0000 (11:57 +0100)
src/vmwaremodule.c

index 3d7f666..9cc180a 100644 (file)
@@ -172,7 +172,8 @@ vmware_chain_module(pointer opts)
        matched = vmwlegacy_devices;
     }
 
-    for (i = 0; i < vmware_devices; i++) {
+    /* Xorg -configure returns 1 from xf86MatchDevice with NULL gdevs */
+    for (i = 0; gdevs && i < vmware_devices; i++) {
        gdev = gdevs[i];
        gdev->driver = driver_name;
     }