summaryrefslogtreecommitdiff
path: root/src/XListDProp.c
diff options
context:
space:
mode:
authorMichal Srb <msrb@suse.com>2014-11-01 20:00:51 +0200
committerPeter Hutterer <peter.hutterer@who-t.net>2014-11-03 15:28:35 +1000
commit22ae8d4f26e92b17e1ce8239a38481933d6f1ca7 (patch)
treecd8cb5789e84ea3ec0f97fbf721bc994176cb1ac /src/XListDProp.c
parent71a42145b678be623e30bd5bf55833a04f14376f (diff)
downloadxorg-lib-libXi-22ae8d4f26e92b17e1ce8239a38481933d6f1ca7.tar.gz
Fix double unlock when _XiCheckExtInit return -1.
_XiCheckExtInit unlocks the display if it fails and returns -1. Most callers account for it properly, but few didn't. Signed-off-by: Michal Srb <msrb@suse.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'src/XListDProp.c')
-rw-r--r--src/XListDProp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/XListDProp.c b/src/XListDProp.c
index bde6cb5..55f3c51 100644
--- a/src/XListDProp.c
+++ b/src/XListDProp.c
@@ -51,7 +51,7 @@ XListDeviceProperties(Display* dpy, XDevice* dev, int *nprops_return)
LockDisplay(dpy);
*nprops_return = 0;
if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- goto cleanup;
+ return NULL;
GetReq(ListDeviceProperties, req);
req->reqType = info->codes->major_opcode;