Commit 62725293 authored by Olivier Fourdan's avatar Olivier Fourdan Committed by Olivier Fourdan
Browse files

dix: Guard against non-existing PtrFeedbackPtr

Trying to change the pointer control settings on a device without
PtrFeedbackPtr would be a bug and a crash in the Xserver.

Guard against that case by returning early with a BadImplementation
error, that might kill the X11 client but the Xserver would survive.
Signed-off-by: default avatarOlivier Fourdan <>
Reviewed-by: Peter Hutterer's avatarPeter Hutterer <>
Related: xorg/xserver#1137
(cherry picked from commit dee2bb03)
parent d41b4334
Pipeline #334332 passed with stages
in 7 minutes and 43 seconds
......@@ -2261,6 +2261,9 @@ ProcChangePointerControl(ClientPtr client)
/* If the device has no PtrFeedbackPtr, the xserver has a bug */
BUG_RETURN_VAL (!mouse->ptrfeed, BadImplementation);
ctrl = mouse->ptrfeed->ctrl;
if ((stuff->doAccel != xTrue) && (stuff->doAccel != xFalse)) {
client->errorValue = stuff->doAccel;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment