From 6cbaf15e6109ba77819c4070f5b46c78237ec460 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue, 19 Feb 2008 12:02:22 +1030
Subject: xfree86: guard against NULL-pointer dereferences in xf86LoadModules.

Should have been part of 3abce3ea2b1f43bd111664d4a57e5ccd282acab0, but I
forgot to git-update-index before I committed.

Thanks to Bill Crawford for pointing it out.
---
 hw/xfree86/common/xf86Init.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'hw')

diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 0d90b9d43..7bcfdff40 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -1951,10 +1951,11 @@ xf86LoadModules(char **list, pointer *optlist)
 	if (!desc) {
 	    LoaderErrorMsg(NULL, name, errmaj, errmin);
 	    failed = TRUE;
+	} else {
+	    xfree(desc->name);
+	    xfree(desc);
 	}
 	xfree(name);
-	xfree(desc->name);
-	xfree(desc);
     }
     return !failed;
 }
-- 
cgit v1.2.3