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

Add request length checking test cases for some Xinput 2.x requests 

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Alan Coopersmith 2014-02-09 21:28:05 -08:00
parent d153a85f74
commit 2df83bb122
4 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/xi2/protocol-xigetclientpointer.c
View File

@ -124,6 +124,11 @@ test_XIGetClientPointer(void)
request.win = INVALID_WINDOW_ID; request.win = INVALID_WINDOW_ID;
request_XIGetClientPointer(&client_request, &request, BadWindow); request_XIGetClientPointer(&client_request, &request, BadWindow);
printf("Testing invalid length\n");
client_request.req_len -= 4;
request_XIGetClientPointer(&client_request, &request, BadLength);
client_request.req_len += 4;
test_data.cp_is_set = FALSE; test_data.cp_is_set = FALSE;
printf("Testing window None, unset ClientPointer.\n"); printf("Testing window None, unset ClientPointer.\n");

8
test/xi2/protocol-xipassivegrabdevice.c
View File

@ -139,6 +139,7 @@ request_XIPassiveGrabDevice(ClientPtr client, xXIPassiveGrabDeviceReq * req,
int local_modifiers; int local_modifiers;
int mask_len; int mask_len;
client_request.req_len = req->length;
rc = ProcXIPassiveGrabDevice(&client_request); rc = ProcXIPassiveGrabDevice(&client_request);
assert(rc == error); assert(rc == error);
@ -190,6 +191,13 @@ test_XIPassiveGrabDevice(void)
request_XIPassiveGrabDevice(&client_request, request, BadDevice, request_XIPassiveGrabDevice(&client_request, request, BadDevice,
request->deviceid); request->deviceid);
printf("Testing invalid length\n");
request->length -= 2;
request_XIPassiveGrabDevice(&client_request, request, BadLength,
client_request.errorValue);
/* re-init request since swapped length test leaves some values swapped */
request_init(request, XIPassiveGrabDevice);
request->grab_window = CLIENT_WINDOW_ID;
request->deviceid = XIAllMasterDevices; request->deviceid = XIAllMasterDevices;
printf("Testing invalid grab types\n"); printf("Testing invalid grab types\n");

4
test/xi2/protocol-xiquerypointer.c
View File

@ -201,6 +201,10 @@ test_XIQueryPointer(void)
test_data.dev = devices.mouse; test_data.dev = devices.mouse;
request.deviceid = devices.mouse->id; request.deviceid = devices.mouse->id;
request_XIQueryPointer(&client_request, &request, Success); request_XIQueryPointer(&client_request, &request, Success);
/* test REQUEST_SIZE_MATCH */
client_request.req_len -= 4;
request_XIQueryPointer(&client_request, &request, BadLength);
} }
int int

3
test/xi2/protocol-xiwarppointer.c
View File

@ -198,6 +198,9 @@ test_XIWarpPointer(void)
request_XIWarpPointer(&client_request, &request, Success); request_XIWarpPointer(&client_request, &request, Success);
/* FIXME: src_x/y checks */ /* FIXME: src_x/y checks */
client_request.req_len -= 2; /* invalid length */
request_XIWarpPointer(&client_request, &request, BadLength);
} }
int int