From 2475ef60977f6813dec74ef0837a5915b8a48bbc Mon Sep 17 00:00:00 2001
From: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Date: Thu, 22 Jul 2010 12:48:55 +0300
Subject: xkb: Fix NULL pointer dereference

xkb->names is dereferenced in else path too.

Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 xkb/xkmread.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/xkb/xkmread.c b/xkb/xkmread.c
index 9eb86018e..b564195bc 100644
--- a/xkb/xkmread.c
+++ b/xkb/xkmread.c
@@ -686,7 +686,11 @@ int			nRead=0;
 	    if ((tmp=XkmGetCountedString(file,buf,100))<1)
 		return -1;
 	    nRead+= tmp;
-	    if ((buf[0]!='\0')&&(xkb->names)) {
+
+	    if (!xkb->names)
+		    continue;
+
+	    if (buf[0]!='\0') {
 		Atom name;
 		name= XkbInternAtom(buf,0);
 		xkb->names->groups[i]= name;
-- 
cgit v1.2.3