summaryrefslogtreecommitdiff
path: root/record
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2006-05-10 15:44:27 +0000
committerAdam Jackson <ajax@nwnk.net>2006-05-10 15:44:27 +0000
commit9a2a63ca3ff30d15e82a29e75a3720ba5b446978 (patch)
treea6ccdaa05e13fab4c1f56e9e5ea15295d34e5507 /record
parentab1a0249ba5e3174f18a1db212bc511fd7d74cb0 (diff)
Bug #3561: Crash fix in the Record extension. (Paul Anderson)
Diffstat (limited to 'record')
-rw-r--r--record/record.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/record/record.c b/record/record.c
index 8814edcf4..070a120df 100644
--- a/record/record.c
+++ b/record/record.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xserver/xorg/record/record.c,v 1.6 2006/02/10 22:00:30 anholt Exp $ */
+/* $XdotOrg: xserver/xorg/record/record.c,v 1.7 2006/03/28 01:21:00 ajax Exp $ */
/* $Xorg: record.c,v 1.4 2001/02/09 02:05:27 xorgcvs Exp $ */
/*
@@ -785,13 +785,13 @@ RecordADeliveredEventOrError(CallbackListPtr *pcbl, pointer nulldata, pointer ca
xEvent *pev = pei->events;
for (ev = 0; ev < pei->count; ev++, pev++)
{
- int recordit;
- if (pev->u.u.type == X_Error)
+ int recordit = 0;
+ if (pRCAP->pErrorSet)
{
recordit = RecordIsMemberOfSet(pRCAP->pErrorSet,
((xError *)(pev))->errorCode);
}
- else
+ else if (pRCAP->pDeliveredEventSet)
{
recordit = RecordIsMemberOfSet(pRCAP->pDeliveredEventSet,
pev->u.u.type & 0177);