Fix two glaring unconditional-NULL-dereferences.

1 files changed, 6 insertions, 0 deletions

diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
index f3c3ff8ca..70fb9e412 100644
--- a/xkb/xkbUtils.c
+++ b/xkb/xkbUtils.c
@@ -682,6 +682,9 @@ CARD16 		grp_mask;
 XkbStatePtr	state= &xkbi->state;
 XkbCompatMapPtr	map;
 
+    if (!state || !xkbi->desc || !xkbi->desc->ctrls || !xkbi->desc->compat)
+        return;
+
     map= xkbi->desc->compat;
     grp_mask= map->groups[state->group].mask;
     state->compat_state = state->mods|grp_mask;
@@ -741,6 +744,9 @@ XkbStatePtr	state= &xkbi->state;
 XkbControlsPtr	ctrls= xkbi->desc->ctrls;
 unsigned char	grp;
 
+    if (!state || !ctrls)
+        return;
+
     state->mods= (state->base_mods|state->latched_mods);
     state->mods|= state->locked_mods;
     state->lookup_mods= state->mods&(~ctrls->internal.mask);