frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug #3561: Crash fix in the Record extension. (Paul Anderson)

This commit is contained in:
Adam Jackson 2006-05-10 15:44:27 +00:00
parent ab1a0249ba
commit 9a2a63ca3f
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> 2006-05-09 Adam Jackson <ajax@freedesktop.org>
* render/render.c: * render/render.c:

8
record/record.c
View File

@ -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 $ */ /* $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; xEvent *pev = pei->events;
for (ev = 0; ev < pei->count; ev++, pev++) for (ev = 0; ev < pei->count; ev++, pev++)
{ {
int recordit; int recordit = 0;
if (pev->u.u.type == X_Error) if (pRCAP->pErrorSet)
{ {
recordit = RecordIsMemberOfSet(pRCAP->pErrorSet, recordit = RecordIsMemberOfSet(pRCAP->pErrorSet,
((xError *)(pev))->errorCode); ((xError *)(pev))->errorCode);
} }
else else if (pRCAP->pDeliveredEventSet)
{ {
recordit = RecordIsMemberOfSet(pRCAP->pDeliveredEventSet, recordit = RecordIsMemberOfSet(pRCAP->pDeliveredEventSet,
pev->u.u.type & 0177); pev->u.u.type & 0177);