Coverity #203, #204: Fix potential NULL dereferences.

This commit is contained in:
Daniel Stone 2006-04-09 22:22:03 +03:00
parent cfcafbe48d
commit 7672bf93bc

View file

@ -718,7 +718,10 @@ XkbGetKeyExplicitComponents( Display * dpy,
if ((num>0)&&(first>=xkb->min_key_code)&&(first+num<=xkb->max_key_code))
bzero(&xkb->server->explicit[first],num);
}
status= _XkbHandleGetMapReply(dpy, xkb);
if (xkb)
status= _XkbHandleGetMapReply(dpy, xkb);
else
status = BadMatch;
UnlockDisplay(dpy);
SyncHandle();
@ -747,7 +750,10 @@ XkbGetKeyModifierMap(Display *dpy,unsigned first,unsigned num,XkbDescPtr xkb)
if ((num>0)&&(first>=xkb->min_key_code)&&(first+num<=xkb->max_key_code))
bzero(&xkb->map->modmap[first],num);
}
status= _XkbHandleGetMapReply(dpy, xkb);
if (xkb)
status= _XkbHandleGetMapReply(dpy, xkb);
else
status = BadMatch;
UnlockDisplay(dpy);
SyncHandle();