diff options
| author | marha <marha@users.sourceforge.net> | 2011-12-08 09:32:47 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-12-08 09:32:47 +0100 |
| commit | acd000667561cb9978ead7f14d4fbb97c1a8e727 (patch) | |
| tree | 21668e5efeb08af34de6c679d4c46cc6fe5d7b64 /xorg-server/hw/xfree86/parser/scan.c | |
| parent | 893624a6c15d4ee6cf1d46e4ad29282c72bee962 (diff) | |
| parent | 5b178ff5a5f0b6e481cf9fd9749eb7ef9581c987 (diff) | |
| download | vcxsrv-acd000667561cb9978ead7f14d4fbb97c1a8e727.tar.gz vcxsrv-acd000667561cb9978ead7f14d4fbb97c1a8e727.tar.bz2 vcxsrv-acd000667561cb9978ead7f14d4fbb97c1a8e727.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server/hw/xfree86/parser/scan.c')
| -rw-r--r-- | xorg-server/hw/xfree86/parser/scan.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/xorg-server/hw/xfree86/parser/scan.c b/xorg-server/hw/xfree86/parser/scan.c index 9099227bb..156bc299a 100644 --- a/xorg-server/hw/xfree86/parser/scan.c +++ b/xorg-server/hw/xfree86/parser/scan.c @@ -852,6 +852,10 @@ OpenConfigDir(const char *path, const char *cmdline, const char *projroot, /* match files named *.conf */ num = scandir(dirpath, &list, ConfigFilter, alphasort); + if (num < 0) { + list = NULL; + num = 0; + } found = AddConfigDirFiles(dirpath, list, num); if (!found) { free(dirpath); |