Skip to content

N
nx-libs
Commit 5b0bf752 authored by Ulrich Sibiller's avatar Ulrich Sibiller
Browse files
Options

xkb: Initialize pad bytes sent in replies of geometry requests.

Backport of commit dc9ce695a69ca0787f58f8d160212a7a41acb703 Author: Rami Ylimäki <rami.ylimaki@vincit.fi> Date: Wed Mar 9 15:45:40 2011 +0200 xkb: Initialize pad bytes sent in replies of geometry requests. Valgrind complains about uninitialized data being written to clients. Reviewed-by: 's avatarErkki Seppälä <erkki.seppala@vincit.fi> Signed-off-by: 's avatarRami Ylimäki <rami.ylimaki@vincit.fi> Reviewed-by: 's avatarDaniel Stone <daniel@fooishbar.org> Reviewed-by: 's avatarPeter Hutterer <peter.hutterer@who-t.net> Signed-off-by: 's avatarPeter Hutterer <peter.hutterer@who-t.net>
parent a4fad8f5
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 3 deletions
nx-X11/programs/Xserver/xkb/xkb.c
View file @ 5b0bf752
...@@ -3783,7 +3783,7 @@ ProcXkbSetNames(ClientPtr client) ...@@ -3783,7 +3783,7 @@ ProcXkbSetNames(ClientPtr client)
static char * static char *
XkbWriteCountedString(char *wire,char *str,Bool swap) XkbWriteCountedString(char *wire,char *str,Bool swap)
{ {
CARD16 len,*pLen; CARD16 len,*pLen, paddedLen;
len= (str?strlen(str):0); len= (str?strlen(str):0);
pLen= (CARD16 *)wire; pLen= (CARD16 *)wire;
...@@ -3791,8 +3791,9 @@ CARD16 len,*pLen; ...@@ -3791,8 +3791,9 @@ CARD16 len,*pLen;
if (swap) { if (swap) {
swaps(pLen); swaps(pLen);
} }
memcpy(&wire[2],str,len); paddedLen= pad_to_int32(sizeof(len)+len)-sizeof(len);
wire+= ((2+len+3)/4)*4; strncpy(&wire[sizeof(len)],str,paddedLen);
wire+= sizeof(len)+paddedLen;
return wire; return wire;
} }
...@@ -3903,6 +3904,7 @@ xkbShapeWireDesc * shapeWire; ...@@ -3903,6 +3904,7 @@ xkbShapeWireDesc * shapeWire;
if (shape->approx!=NULL) if (shape->approx!=NULL)
shapeWire->approxNdx= XkbOutlineIndex(shape,shape->approx); shapeWire->approxNdx= XkbOutlineIndex(shape,shape->approx);
else shapeWire->approxNdx= XkbNoShape; else shapeWire->approxNdx= XkbNoShape;
shapeWire->pad= 0;
if (swap) { if (swap) {
swapl(&shapeWire->name); swapl(&shapeWire->name);
} }
...@@ -3914,6 +3916,7 @@ xkbShapeWireDesc * shapeWire; ...@@ -3914,6 +3916,7 @@ xkbShapeWireDesc * shapeWire;
olWire= (xkbOutlineWireDesc *)wire; olWire= (xkbOutlineWireDesc *)wire;
olWire->nPoints= ol->num_points; olWire->nPoints= ol->num_points;
olWire->cornerRadius= ol->corner_radius; olWire->cornerRadius= ol->corner_radius;
olWire->pad= 0;
wire= (char *)&olWire[1]; wire= (char *)&olWire[1];
ptWire= (xkbPointWireDesc *)wire; ptWire= (xkbPointWireDesc *)wire;
for (p=0,pt=ol->points;p<ol->num_points;p++,pt++) { for (p=0,pt=ol->points;p<ol->num_points;p++,pt++) {
...@@ -4023,6 +4026,8 @@ xkbOverlayWireDesc * olWire; ...@@ -4023,6 +4026,8 @@ xkbOverlayWireDesc * olWire;
olWire= (xkbOverlayWireDesc *)wire; olWire= (xkbOverlayWireDesc *)wire;
olWire->name= ol->name; olWire->name= ol->name;
olWire->nRows= ol->num_rows; olWire->nRows= ol->num_rows;
olWire->pad1= 0;
olWire->pad2= 0;
if (swap) { if (swap) {
swapl(&olWire->name); swapl(&olWire->name);
} }
...@@ -4034,6 +4039,7 @@ xkbOverlayWireDesc * olWire; ...@@ -4034,6 +4039,7 @@ xkbOverlayWireDesc * olWire;
rowWire= (xkbOverlayRowWireDesc *)wire; rowWire= (xkbOverlayRowWireDesc *)wire;
rowWire->rowUnder= row->row_under; rowWire->rowUnder= row->row_under;
rowWire->nKeys= row->num_keys; rowWire->nKeys= row->num_keys;
rowWire->pad1= 0;
wire= (char *)&rowWire[1]; wire= (char *)&rowWire[1];
for (k=0,key=row->keys;k<row->num_keys;k++,key++) { for (k=0,key=row->keys;k<row->num_keys;k++,key++) {
xkbOverlayKeyWireDesc * keyWire; xkbOverlayKeyWireDesc * keyWire;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment