From 5b178ff5a5f0b6e481cf9fd9749eb7ef9581c987 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Thu, 8 Dec 2011 09:26:34 +0100
Subject: git update glproto libX11 libxcb mesa xserver 8 dec 2011

---
 xorg-server/hw/xfree86/parser/scan.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'xorg-server/hw/xfree86/parser')

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);
-- 
cgit v1.2.3