summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2011-10-26 14:42:36 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2011-11-10 13:04:45 +1000
commit609039e67ef62f3e4efd0e04572bdcd86ea45d34 (patch)
tree6c6ff5515c80538149656d52512d6a868ca23154
parent9c3baacbd819eae122a4c0b679efc3c36895cff9 (diff)
test-xi2: check return value of list, exit on failure
If list() fails, the server doesn't support XI2 or the device is invalid. In either case, exit. Fixes crashes when a nonexisting device is given. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--src/test_xi2.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/test_xi2.c b/src/test_xi2.c
index 9ecfa1d..e7fd99c 100644
--- a/src/test_xi2.c
+++ b/src/test_xi2.c
@@ -324,8 +324,12 @@ test_xi2(Display *display,
XIEventMask mask;
Window win;
int deviceid = -1;
+ int rc;
+
+ rc = list(display, argc, argv, name, desc);
+ if (rc != EXIT_SUCCESS)
+ return rc;
- list(display, argc, argv, name, desc);
if (argc >= 1) {
XIDeviceInfo *info;
info = xi2_find_device_info(display, argv[0]);