diff options
| author | Adam Jackson <ajax@nwnk.net> | 2006-05-10 15:44:18 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2006-05-10 15:44:18 +0000 |
| commit | ba454e6f51de4a4c55d1cf5ed02d85c258a0a777 (patch) | |
| tree | a0538c9de8d882051368af3931dcb73dc31dd4fd | |
| parent | 3a332610eb5853652263139bce4db4ba2242dd48 (diff) | |
Bug #3561: Crash fix in the Record extension. (Paul Anderson)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | record/record.c | 8 |
2 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,8 @@ +2006-05-10 Adam Jackson <ajax@freedesktop.org> + + * record/record.c: + Bug #3561: Crash fix in the Record extension. (Paul Anderson) + 2006-05-09 Adam Jackson <ajax@freedesktop.org> * render/render.c: 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); |