diff options
| author | Daniel Stone <daniels@endtroducing.localdomain> | 2006-04-09 22:22:03 +0300 |
|---|---|---|
| committer | Jamey Sharp <jamey@minilop.net> | 2006-06-06 11:23:54 -0700 |
| commit | cc533db60cb64dc163c66451933a9bf77c519062 (patch) | |
| tree | 5840c692c2bd52fddb666fe3c5686626db1c6a52 | |
| parent | b83adf7dfd6157694fe4f232012fef36cd9666da (diff) | |
Coverity #203, #204: Fix potential NULL dereferences.
| -rw-r--r-- | src/xkb/XKBGetMap.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/xkb/XKBGetMap.c b/src/xkb/XKBGetMap.c index 0e970836..777f7cc5 100644 --- a/src/xkb/XKBGetMap.c +++ b/src/xkb/XKBGetMap.c @@ -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(); |