From 3147ddbf47897688b61e95c18f255cbd8ccc0532 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erkki=20Sepp=C3=A4l=C3=A4?= <erkki.seppala@vincit.fi>
Date: Wed, 12 Jan 2011 15:51:11 +0200
Subject: Variable "entry" tracked as NULL was dereferenced.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Check entry for non-nullness before dereferencing it

Reviewed-by: Dirk Wallenstein <halsmit@t-online.de>
Reviewed-by: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.com>
Signed-off-by: Erkki Seppälä <erkki.seppala@vincit.fi>
Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
---
 nx-X11/lib/X11/XKB.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nx-X11')

diff --git a/nx-X11/lib/X11/XKB.c b/nx-X11/lib/X11/XKB.c
index 008609608..a62e24282 100644
--- a/nx-X11/lib/X11/XKB.c
+++ b/nx-X11/lib/X11/XKB.c
@@ -462,7 +462,7 @@ XkbKTMapEntryPtr	entry = NULL;
     if (map_rtrn!=NULL) {
 	bzero(map_rtrn,type->mods.mask+1);
 	for (i=0;i<type->map_count;i++) {
-	    if (entry->active) {
+	    if (entry && entry->active) {
 		map_rtrn[type->map[i].mods.mask]= type->map[i].level;
 	    }
 	}
-- 
cgit v1.2.3