From f324be00c547effc698ae6679d12ffe90bd90e43 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Sun, 9 Apr 2006 17:28:42 +0000
Subject: [PATCH] Coverity #324: Fix potential NULL dereference. (Alan
 Coopersmith)

---
 ChangeLog       | 3 +++
 xkb/XKBMAlloc.c | 1 +
 2 files changed, 4 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 721617503..5a68c8041 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
 	* xkb/ddxList.c:
 	Coverity #169: Fix potential fgets() into NULL (?!?).
 
+	* xkb/XKBMAlloc.c:
+	Coverity #324: Fix potential NULL dereference.  (Alan Coopersmith)
+
 2006-04-07  Aaron Plattner  <aplattner@nvidia.com>
 
 	* hw/xfree86/common/xf86Module.h:
diff --git a/xkb/XKBMAlloc.c b/xkb/XKBMAlloc.c
index 6c47db03c..ce79ef090 100644
--- a/xkb/XKBMAlloc.c
+++ b/xkb/XKBMAlloc.c
@@ -305,6 +305,7 @@ XkbClientMapPtr	map;
 	tmp= XkbNumRequiredTypes+1;
 	if (XkbAllocClientMap(xkb,XkbKeyTypesMask,tmp)!=Success)
 	    return NULL;
+        map = xkb->map;
 	tmp= 0;
 	if (map->num_types<=XkbKeypadIndex)
 	    tmp|= XkbKeypadMask;