frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Valgrind complains about uninitialized data being written to clients.

Reviewed-by: Erkki Seppälä <erkki.seppala@vincit.fi>
Signed-off-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Rami Ylimäki 2011-03-09 15:45:40 +02:00 committed by Peter Hutterer
parent ee3a4951a4
commit dc9ce695a6
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
xkb/xkb.c
View File

@ -4321,7 +4321,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;
if (!str) if (!str)
return wire; return wire;
@ -4333,8 +4333,9 @@ XkbWriteCountedString(char *wire,char *str,Bool swap)
register int n; register int n;
swaps(pLen,n); swaps(pLen,n);
} }
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;
} }
@ -4445,6 +4446,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) {
register int n; register int n;
swapl(&shapeWire->name,n); swapl(&shapeWire->name,n);
@ -4457,6 +4459,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++) {
@ -4570,6 +4573,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) {
register int n; register int n;
swapl(&olWire->name,n); swapl(&olWire->name,n);
@ -4582,6 +4587,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;