aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/dix/devices.c
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2018-06-21 21:46:52 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-07-03 16:13:43 +0200
commit1e3db85a026338e5a56de9f75bddeff283ba24fb (patch)
tree8546b1ce51c26ff97fd0c1c5b95fe733f691608d /nx-X11/programs/Xserver/dix/devices.c
parent7a627e644242bdbb00e5cdac4536c64268454af3 (diff)
downloadnx-libs-1e3db85a026338e5a56de9f75bddeff283ba24fb.tar.gz
nx-libs-1e3db85a026338e5a56de9f75bddeff283ba24fb.tar.bz2
nx-libs-1e3db85a026338e5a56de9f75bddeff283ba24fb.zip
Fix some valgrind findings
Some of them have not been seen in the wild yet. Partly fixes ArcticaProject/nx-libs#711
Diffstat (limited to 'nx-X11/programs/Xserver/dix/devices.c')
-rw-r--r--nx-X11/programs/Xserver/dix/devices.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/nx-X11/programs/Xserver/dix/devices.c b/nx-X11/programs/Xserver/dix/devices.c
index 1c7572d64..d31ff8224 100644
--- a/nx-X11/programs/Xserver/dix/devices.c
+++ b/nx-X11/programs/Xserver/dix/devices.c
@@ -908,7 +908,7 @@ AllModifierKeysAreUp(dev, map1, per1, map2, per2)
int
ProcSetModifierMapping(ClientPtr client)
{
- xSetModifierMappingReply rep;
+ xSetModifierMappingReply rep = {0};
REQUEST(xSetModifierMappingReq);
KeyCode *inputMap;
int inputMapLen;
@@ -1016,11 +1016,10 @@ ProcSetModifierMapping(ClientPtr client)
int
ProcGetModifierMapping(ClientPtr client)
{
- xGetModifierMappingReply rep;
+ xGetModifierMappingReply rep = {0};
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;
@@ -1082,7 +1081,7 @@ ProcSetPointerMapping(ClientPtr client)
{
REQUEST(xSetPointerMappingReq);
BYTE *map;
- xSetPointerMappingReply rep;
+ xSetPointerMappingReply rep = {0};
register unsigned int i;
DeviceIntPtr mouse = inputInfo.pointer;
@@ -1119,7 +1118,7 @@ ProcSetPointerMapping(ClientPtr client)
int
ProcGetKeyboardMapping(ClientPtr client)
{
- xGetKeyboardMappingReply rep;
+ xGetKeyboardMappingReply rep = {0};
REQUEST(xGetKeyboardMappingReq);
KeySymsPtr curKeySyms = &inputInfo.keyboard->key->curKeySyms;
@@ -1138,7 +1137,6 @@ ProcGetKeyboardMapping(ClientPtr client)
return BadValue;
}
- memset(&rep, 0, sizeof(xGetKeyboardMappingReply));
rep.type = X_Reply;
rep.sequenceNumber = client->sequence;
rep.keySymsPerKeyCode = curKeySyms->mapWidth;
@@ -1387,7 +1385,7 @@ ProcGetKeyboardControl (ClientPtr client)
{
int i;
register KeybdCtrl *ctrl = &inputInfo.keyboard->kbdfeed->ctrl;
- xGetKeyboardControlReply rep;
+ xGetKeyboardControlReply rep = {0};
REQUEST_SIZE_MATCH(xReq);
rep.type = X_Reply;
@@ -1492,7 +1490,7 @@ int
ProcGetPointerControl(ClientPtr client)
{
register PtrCtrl *ctrl = &inputInfo.pointer->ptrfeed->ctrl;
- xGetPointerControlReply rep;
+ xGetPointerControlReply rep = {0};
REQUEST_SIZE_MATCH(xReq);
rep.type = X_Reply;
@@ -1526,7 +1524,7 @@ ProcGetMotionEvents(ClientPtr client)
{
WindowPtr pWin;
xTimecoord * coords = (xTimecoord *) NULL;
- xGetMotionEventsReply rep;
+ xGetMotionEventsReply rep = {0};
int i, count, xmin, xmax, ymin, ymax;
unsigned long nEvents;
DeviceIntPtr mouse = inputInfo.pointer;
@@ -1591,7 +1589,7 @@ ProcGetMotionEvents(ClientPtr client)
int
ProcQueryKeymap(ClientPtr client)
{
- xQueryKeymapReply rep;
+ xQueryKeymapReply rep = {0};
int i;
CARD8 *down = inputInfo.keyboard->key->down;