aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/dix/devices.c
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2015-07-03 17:07:30 +0200
committerMihai Moldovan <ionic@ionic.de>2015-07-03 17:07:30 +0200
commitca19c342ca6f829894fb0cdd652bd2731029084b (patch)
treee2c3bc4d3d91cd04767461d21dc6261cf20ce4f5 /nx-X11/programs/Xserver/dix/devices.c
parent61013ec4fd85e9f8eef1f34bf6d1855ba26211d7 (diff)
parentd088698324d5e71cb93ccd429f084729ba07872c (diff)
downloadnx-libs-ca19c342ca6f829894fb0cdd652bd2731029084b.tar.gz
nx-libs-ca19c342ca6f829894fb0cdd652bd2731029084b.tar.bz2
nx-libs-ca19c342ca6f829894fb0cdd652bd2731029084b.zip
Merge branch 'uli42-pr/backported_fixes' into arctica-3.6.x
Attributes GH PR #50: https://github.com/ArcticaProject/nx-libs/pull/50
Diffstat (limited to 'nx-X11/programs/Xserver/dix/devices.c')
-rw-r--r--nx-X11/programs/Xserver/dix/devices.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/dix/devices.c b/nx-X11/programs/Xserver/dix/devices.c
index e26879f28..e29154cfc 100644
--- a/nx-X11/programs/Xserver/dix/devices.c
+++ b/nx-X11/programs/Xserver/dix/devices.c
@@ -1037,6 +1037,7 @@ ProcGetModifierMapping(ClientPtr client)
register KeyClassPtr keyc = inputInfo.keyboard->key;
REQUEST_SIZE_MATCH(xReq);
+ memset(&rep, 0, sizeof(xGetModifierMappingReply));
rep.type = X_Reply;
rep.numKeyPerModifier = keyc->maxKeysPerModifier;
rep.sequenceNumber = client->sequence;
@@ -1157,6 +1158,7 @@ ProcGetKeyboardMapping(ClientPtr client)
return BadValue;
}
+ memset(&rep, 0, sizeof(xGetKeyboardMappingReply));
rep.type = X_Reply;
rep.sequenceNumber = client->sequence;
rep.keySymsPerKeyCode = curKeySyms->mapWidth;