aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/dix/devices.c
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2017-12-28 00:18:58 +0100
committerMihai Moldovan <ionic@ionic.de>2017-12-28 00:18:58 +0100
commit061c357727dd6a3a37e547091d76f26c080f0738 (patch)
treea270c581d3268b20ef8527cffeb8ad91b26b9cf7 /nx-X11/programs/Xserver/dix/devices.c
parentbc5f9a2363cb865fa1a8a1427d9320514e7d1889 (diff)
parent6acbfab33133a92dbd7f128284d26f94bfeb1af2 (diff)
downloadnx-libs-061c357727dd6a3a37e547091d76f26c080f0738.tar.gz
nx-libs-061c357727dd6a3a37e547091d76f26c080f0738.tar.bz2
nx-libs-061c357727dd6a3a37e547091d76f26c080f0738.zip
Merge branch 'uli42-pr/reduce_uninitialised' into 3.6.x
Diffstat (limited to 'nx-X11/programs/Xserver/dix/devices.c')
-rw-r--r--nx-X11/programs/Xserver/dix/devices.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/dix/devices.c b/nx-X11/programs/Xserver/dix/devices.c
index 427169222..b93a40d97 100644
--- a/nx-X11/programs/Xserver/dix/devices.c
+++ b/nx-X11/programs/Xserver/dix/devices.c
@@ -1158,7 +1158,8 @@ ProcGetKeyboardMapping(ClientPtr client)
int
ProcGetPointerMapping(ClientPtr client)
{
- xGetPointerMappingReply rep;
+ xGetPointerMappingReply rep = {0};
+
ButtonClassPtr butc = inputInfo.pointer->button;
REQUEST_SIZE_MATCH(xReq);
@@ -1168,7 +1169,7 @@ ProcGetPointerMapping(ClientPtr client)
rep.length = ((unsigned)rep.nElts + (4-1))/4;
WriteReplyToClient(client, sizeof(xGetPointerMappingReply), &rep);
WriteToClient(client, (int)rep.nElts, &butc->map[1]);
- return Success;
+ return Success;
}
void