From: Julien Cristau Date: Tue, 13 Jul 2010 10:57:15 +0000 (+0100) Subject: Don't crash the server on Xorg -configure X-Git-Tag: xf86-video-vmware-11.0.2~12 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e647511e4b9b924b0617171c56b3bb485674b3ff;p=platform%2Fupstream%2Fxf86-video-vmware.git Don't crash the server on Xorg -configure --- diff --git a/src/vmwaremodule.c b/src/vmwaremodule.c index 3d7f666..9cc180a 100644 --- a/src/vmwaremodule.c +++ b/src/vmwaremodule.c @@ -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; }