Module Name:    xsrc
Committed By:   mrg
Date:           Sat May 29 05:11:48 UTC 2010

Modified Files:
        xsrc/external/mit/xf86-video-vmware/dist/src: vmwaremodule.c

Log Message:
avoid vmware module crashing with "X -configure".


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
    xsrc/external/mit/xf86-video-vmware/dist/src/vmwaremodule.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-vmware/dist/src/vmwaremodule.c
diff -u xsrc/external/mit/xf86-video-vmware/dist/src/vmwaremodule.c:1.2 xsrc/external/mit/xf86-video-vmware/dist/src/vmwaremodule.c:1.3
--- xsrc/external/mit/xf86-video-vmware/dist/src/vmwaremodule.c:1.2	Sun May 23 06:36:09 2010
+++ xsrc/external/mit/xf86-video-vmware/dist/src/vmwaremodule.c	Sat May 29 05:11:48 2010
@@ -152,7 +152,7 @@
     int vmware_devices;
     int matched;
     char *driver_name;
-    GDevPtr *gdevs;
+    GDevPtr *gdevs = NULL;
     GDevPtr gdev;
     int i;
 
@@ -173,7 +173,7 @@
 	matched = vmwlegacy_devices;
     }
 
-    for (i = 0; i < vmware_devices; i++) {
+    for (i = 0; gdevs && i < vmware_devices; i++) {
 	gdev = gdevs[i];
 	gdev->driver = driver_name;
     }

Reply via email to