summaryrefslogtreecommitdiff
path: root/dix/resource.c
diff options
context:
space:
mode:
authorEamon Walsh <ewalsh@tycho.nsa.gov>2007-06-04 12:33:49 -0400
committerEamon Walsh <ewalsh@moss-uranus.epoch.ncsc.mil>2007-06-04 12:33:49 -0400
commit793470a8356976ddd427280a738dfb6e1c0e4e70 (patch)
tree4ec33f809998df37cc41d532b6bfd6c8f64549f1 /dix/resource.c
parentddb26bccd275f4fc011f7a2be685d1ce58555a00 (diff)
dix: fix null pointer dereference in new resource lookup function.
Diffstat (limited to 'dix/resource.c')
-rw-r--r--dix/resource.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dix/resource.c b/dix/resource.c
index 67124c754..e89ad1fdd 100644
--- a/dix/resource.c
+++ b/dix/resource.c
@@ -908,7 +908,6 @@ dixLookupResource(pointer *result, XID id, RESTYPE rtype,
ResourcePtr res = NULL;
*result = NULL;
- client->errorValue = id;
if ((cid < MAXCLIENTS) && clientTable[cid].buckets) {
res = clientTable[cid].resources[Hash(cid, id)];
@@ -922,6 +921,7 @@ dixLookupResource(pointer *result, XID id, RESTYPE rtype,
return BadValue;
if (client) {
+ client->errorValue = id;
cid = XaceHook(XACE_RESOURCE_ACCESS, client, id, res->type,
mode, res->value);
if (cid != Success)