2 files changed, 97 insertions, 0 deletions
diff --git a/tests/libXi/Makefile.am b/tests/libXi/Makefile.am
index 288533a..1fd4751 100644
--- a/tests/libXi/Makefile.am
+++ b/tests/libXi/Makefile.am
@@ -22,6 +22,7 @@
 #
 
 noinst_PROGRAMS  = XGetDeviceButtonMapping
+noinst_PROGRAMS += XQueryDeviceState
 noinst_PROGRAMS += XIPassiveGrabDevice
 
 noinst_HEADERS = xhiv-Xi.h
diff --git a/tests/libXi/XQueryDeviceState.c b/tests/libXi/XQueryDeviceState.c
new file mode 100644
index 0000000..8cd5daa
--- /dev/null
+++ b/tests/libXi/XQueryDeviceState.c
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "xhiv.h"
+#include <X11/Xlib.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/XIproto.h>
+#include "xhiv-Xi.h"
+#include <assert.h>
+#include <stdio.h>
+
+
+
+static void
+testOverflowFields(void)
+{
+    const xQueryDeviceStateReply rep1 = {
+        .repType = X_Reply,
+        .RepType = X_QueryDeviceState,
+        .num_classes = 1,
+        .length  = 4
+    };
+    /* We only send the first four words of keys, though libXi expects more */
+    const xKeyState keys = {
+        .class = KeyClass,
+        .length = sizeof(xKeyState),
+        .num_keys = 255,
+    };
+    xhiv_response keys_response = {
+        .length = 4,
+        .response_data = &keys,
+        .response_datalen = 4 << 2,
+        .flags = XHIV_NO_SET_SEQUENCE
+    };
+    xhiv_response response1 = {
+        .next = &xi_opendev_response,
+        .chain = &keys_response,
+        .reqType = MY_XI_EXT_CODE,
+        .reqMinor = X_QueryDeviceState,
+        .sequence = 101,
+        .length = sizeof(rep1) >> 2,
+        .response_data = &rep1,
+        .response_datalen = sizeof(rep1)
+    };
+    Display *dpy = XhivOpenDisplay(&response1);
+    XDevice *device;
+    XDeviceState *state;
+
+    device = XOpenDevice(dpy, MY_DEFAULT_DEVICE);
+    assert(device != NULL);
+    assert(device != (XDevice *) NoSuchExtension);
+
+    /* set sequence to known value so that later calls match by sequence num */
+    XhivSequenceSync(dpy, 100);
+
+    printf("XQueryDeviceState: overflow returned data buffer test\n");
+    state = XQueryDeviceState(dpy, device);
+    XFreeDeviceState(state);
+    assert(state == NULL);
+    /* Don't know how to assert we didn't read past the end of the allocated
+     * memory, without running a tool such as valgrind.
+     */
+
+    XhivCloseDisplay(dpy);
+}
+
+int
+main(int argc, char **argv)
+{
+    testOverflowFields();
+    printf("XQueryDeviceState: all tests passed\n");
+    return 0;
+}