diff options
| author | Michal Srb <msrb@suse.com> | 2017-05-24 15:54:42 +0300 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2017-09-25 15:34:10 -0400 |
| commit | ed8fbabacac3cd4c7798bd36713894a2068cee13 (patch) | |
| tree | 41af43c4d055e61f69c891d484a424c2f90455b2 | |
| parent | e8f6a1bb77cbd1bb30d8dc956c5fdc98e25a22aa (diff) | |
Xi: Do not try to swap GenericEvent.
The SProcXSendExtensionEvent must not attempt to swap GenericEvent because
it is assuming that the event has fixed size and gives the swapping function
xEvent-sized buffer.
A GenericEvent would be later rejected by ProcXSendExtensionEvent anyway.
Signed-off-by: Michal Srb <msrb@suse.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit ba336b24052122b136486961c82deac76bbde455)
| -rw-r--r-- | Xi/sendexev.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Xi/sendexev.c b/Xi/sendexev.c index 365c791e8..5ecc228ee 100644 --- a/Xi/sendexev.c +++ b/Xi/sendexev.c @@ -95,9 +95,17 @@ SProcXSendExtensionEvent(ClientPtr client) eventP = (xEvent *) &stuff[1]; for (i = 0; i < stuff->num_events; i++, eventP++) { + if (eventP->u.u.type == GenericEvent) { + client->errorValue = eventP->u.u.type; + return BadValue; + } + proc = EventSwapVector[eventP->u.u.type & 0177]; - if (proc == NotImplemented) /* no swapping proc; invalid event type? */ + /* no swapping proc; invalid event type? */ + if (proc == NotImplemented) { + client->errorValue = eventP->u.u.type; return BadValue; + } (*proc) (eventP, &eventT); *eventP = eventT; } |