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

xserver: Avoid sending uninitialized padding data over the network 

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Åstrand 2009-02-13 10:23:28 +01:00 committed by Peter Hutterer
parent b735a4b495
commit ddb8d8945d
24 changed files with 86 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Xext/bigreq.c
View File

@ -64,6 +64,7 @@ ProcBigReqDispatch (ClientPtr client)
return BadRequest; return BadRequest;
REQUEST_SIZE_MATCH(xBigReqEnableReq); REQUEST_SIZE_MATCH(xBigReqEnableReq);
client->big_requests = TRUE; client->big_requests = TRUE;
memset(&rep, 0, sizeof(xBigReqEnableReply));
rep.type = X_Reply; rep.type = X_Reply;
rep.length = 0; rep.length = 0;
rep.sequenceNumber = client->sequence; rep.sequenceNumber = client->sequence;

2
Xext/shape.c
View File

@ -256,6 +256,7 @@ ProcShapeQueryVersion (ClientPtr client)
int n; int n;
REQUEST_SIZE_MATCH (xShapeQueryVersionReq); REQUEST_SIZE_MATCH (xShapeQueryVersionReq);
memset(&rep, 0, sizeof(xShapeQueryVersionReply));
rep.type = X_Reply; rep.type = X_Reply;
rep.length = 0; rep.length = 0;
rep.sequenceNumber = client->sequence; rep.sequenceNumber = client->sequence;
@ -682,6 +683,7 @@ ProcShapeQueryExtents (ClientPtr client)
rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess); rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
if (rc != Success) if (rc != Success)
return rc; return rc;
memset(&rep, 0, sizeof(xShapeQueryExtentsReply));
rep.type = X_Reply; rep.type = X_Reply;
rep.length = 0; rep.length = 0;
rep.sequenceNumber = client->sequence; rep.sequenceNumber = client->sequence;

1
Xext/shm.c
View File

@ -309,6 +309,7 @@ ProcShmQueryVersion(ClientPtr client)
int n; int n;
REQUEST_SIZE_MATCH(xShmQueryVersionReq); REQUEST_SIZE_MATCH(xShmQueryVersionReq);
memset(&rep, 0, sizeof(xShmQueryVersionReply));
rep.type = X_Reply; rep.type = X_Reply;
rep.length = 0; rep.length = 0;
rep.sequenceNumber = client->sequence; rep.sequenceNumber = client->sequence;

1
Xext/sync.c
View File

@ -1144,6 +1144,7 @@ ProcSyncInitialize(ClientPtr client)
REQUEST_SIZE_MATCH(xSyncInitializeReq); REQUEST_SIZE_MATCH(xSyncInitializeReq);
memset(&rep, 0, sizeof(xSyncInitializeReply));
rep.type = X_Reply; rep.type = X_Reply;
rep.sequenceNumber = client->sequence; rep.sequenceNumber = client->sequence;
rep.majorVersion = SYNC_MAJOR_VERSION; rep.majorVersion = SYNC_MAJOR_VERSION;

1
Xi/getvers.c
View File

@ -116,6 +116,7 @@ ProcXGetExtensionVersion(ClientPtr client)
pXIClient->minor_version = stuff->minorVersion; pXIClient->minor_version = stuff->minorVersion;
} /* else version unknown, leave it at 0.0 */ } /* else version unknown, leave it at 0.0 */
memset(&rep, 0, sizeof(xGetExtensionVersionReply));
rep.repType = X_Reply; rep.repType = X_Reply;
rep.RepType = X_GetExtensionVersion; rep.RepType = X_GetExtensionVersion;
rep.length = 0; rep.length = 0;

3
Xi/listdev.c
View File

@ -338,6 +338,7 @@ ProcXListInputDevices(ClientPtr client)
REQUEST_SIZE_MATCH(xListInputDevicesReq); REQUEST_SIZE_MATCH(xListInputDevicesReq);
memset(&rep, 0, sizeof(xListInputDevicesReply));
rep.repType = X_Reply; rep.repType = X_Reply;
rep.RepType = X_ListInputDevices; rep.RepType = X_ListInputDevices;
rep.length = 0; rep.length = 0;
@ -379,7 +380,7 @@ ProcXListInputDevices(ClientPtr client)
} }
total_length = numdevs * sizeof(xDeviceInfo) + size + namesize; total_length = numdevs * sizeof(xDeviceInfo) + size + namesize;
devbuf = (char *)xalloc(total_length); devbuf = (char *)xcalloc(1, total_length);
classbuf = devbuf + (numdevs * sizeof(xDeviceInfo)); classbuf = devbuf + (numdevs * sizeof(xDeviceInfo));
namebuf = classbuf + size; namebuf = classbuf + size;
savbuf = devbuf; savbuf = devbuf;

1
Xi/opendev.c
View File

@ -126,6 +126,7 @@ ProcXOpenDevice(ClientPtr client)
if (status != Success) if (status != Success)
return status; return status;
memset(&rep, 0, sizeof(xOpenDeviceReply));
rep.repType = X_Reply; rep.repType = X_Reply;
rep.RepType = X_OpenDevice; rep.RepType = X_OpenDevice;
rep.sequenceNumber = client->sequence; rep.sequenceNumber = client->sequence;

2
dix/devices.c
View File

@ -1466,6 +1466,7 @@ ProcGetModifierMapping(ClientPtr client)
if (ret != Success) if (ret != Success)
return ret; return ret;
memset(&rep, 0, sizeof(xGetModifierMappingReply));
rep.type = X_Reply; rep.type = X_Reply;
rep.numKeyPerModifier = max_keys_per_mod; rep.numKeyPerModifier = max_keys_per_mod;
rep.sequenceNumber = client->sequence; rep.sequenceNumber = client->sequence;
@ -1621,6 +1622,7 @@ ProcGetKeyboardMapping(ClientPtr client)
if (!syms) if (!syms)
return BadAlloc; return BadAlloc;
memset(&rep, 0, sizeof(xGetKeyboardMappingReply));
rep.type = X_Reply; rep.type = X_Reply;
rep.sequenceNumber = client->sequence; rep.sequenceNumber = client->sequence;
rep.keySymsPerKeyCode = syms->mapWidth; rep.keySymsPerKeyCode = syms->mapWidth;

18
dix/dispatch.c
View File

@ -548,6 +548,7 @@ ProcGetWindowAttributes(ClientPtr client)
rc = dixLookupWindow(&pWin, stuff->id, client, DixGetAttrAccess); rc = dixLookupWindow(&pWin, stuff->id, client, DixGetAttrAccess);
if (rc != Success) if (rc != Success)
return rc; return rc;
memset(&wa, 0, sizeof(xGetWindowAttributesReply));
GetWindowAttributes(pWin, client, &wa); GetWindowAttributes(pWin, client, &wa);
WriteReplyToClient(client, sizeof(xGetWindowAttributesReply), &wa); WriteReplyToClient(client, sizeof(xGetWindowAttributesReply), &wa);
return(client->noClientException); return(client->noClientException);
@ -809,6 +810,7 @@ ProcGetGeometry(ClientPtr client)
xGetGeometryReply rep; xGetGeometryReply rep;
int status; int status;
memset(&rep, 0, sizeof(xGetGeometryReply));
if ((status = GetGeometry(client, &rep)) != Success) if ((status = GetGeometry(client, &rep)) != Success)
return status; return status;
@ -830,6 +832,7 @@ ProcQueryTree(ClientPtr client)
rc = dixLookupWindow(&pWin, stuff->id, client, DixListAccess); rc = dixLookupWindow(&pWin, stuff->id, client, DixListAccess);
if (rc != Success) if (rc != Success)
return rc; return rc;
memset(&reply, 0, sizeof(xQueryTreeReply));
reply.type = X_Reply; reply.type = X_Reply;
reply.root = WindowTable[pWin->drawable.pScreen->myNum]->drawable.id; reply.root = WindowTable[pWin->drawable.pScreen->myNum]->drawable.id;
reply.sequenceNumber = client->sequence; reply.sequenceNumber = client->sequence;
@ -883,6 +886,7 @@ ProcInternAtom(ClientPtr client)
if (atom != BAD_RESOURCE) if (atom != BAD_RESOURCE)
{ {
xInternAtomReply reply; xInternAtomReply reply;
memset(&reply, 0, sizeof(xInternAtomReply));
reply.type = X_Reply; reply.type = X_Reply;
reply.length = 0; reply.length = 0;
reply.sequenceNumber = client->sequence; reply.sequenceNumber = client->sequence;
@ -906,6 +910,7 @@ ProcGetAtomName(ClientPtr client)
if ( (str = NameForAtom(stuff->id)) ) if ( (str = NameForAtom(stuff->id)) )
{ {
len = strlen(str); len = strlen(str);
memset(&reply, 0, sizeof(xGetAtomNameReply));
reply.type = X_Reply; reply.type = X_Reply;
reply.length = (len + 3) >> 2; reply.length = (len + 3) >> 2;
reply.sequenceNumber = client->sequence; reply.sequenceNumber = client->sequence;
@ -1002,6 +1007,7 @@ ProcTranslateCoords(ClientPtr client)
rc = dixLookupWindow(&pDst, stuff->dstWid, client, DixGetAttrAccess); rc = dixLookupWindow(&pDst, stuff->dstWid, client, DixGetAttrAccess);
if (rc != Success) if (rc != Success)
return rc; return rc;
memset(&rep, 0, sizeof(xTranslateCoordsReply));
rep.type = X_Reply; rep.type = X_Reply;
rep.length = 0; rep.length = 0;
rep.sequenceNumber = client->sequence; rep.sequenceNumber = client->sequence;
@ -1138,7 +1144,7 @@ ProcQueryFont(ClientPtr client)
rlength = sizeof(xQueryFontReply) + rlength = sizeof(xQueryFontReply) +
FONTINFONPROPS(FONTCHARSET(pFont)) * sizeof(xFontProp) + FONTINFONPROPS(FONTCHARSET(pFont)) * sizeof(xFontProp) +
nprotoxcistructs * sizeof(xCharInfo); nprotoxcistructs * sizeof(xCharInfo);
reply = xalloc(rlength); reply = xcalloc(1, rlength);
if(!reply) if(!reply)
{ {
return(BadAlloc); return(BadAlloc);
@ -1915,6 +1921,7 @@ DoGetImage(ClientPtr client, int format, Drawable drawable,
if (rc != Success) if (rc != Success)
return rc; return rc;
memset(&xgi, 0, sizeof(xGetImageReply));
if(pDraw->type == DRAWABLE_WINDOW) if(pDraw->type == DRAWABLE_WINDOW)
{ {
if( /* check for being viewable */ if( /* check for being viewable */
@ -1966,7 +1973,7 @@ DoGetImage(ClientPtr client, int format, Drawable drawable,
xgi.length = length; xgi.length = length;
if (im_return) { if (im_return) {
pBuf = xalloc(sz_xGetImageReply + length); pBuf = xcalloc(1, sz_xGetImageReply + length);
if (!pBuf) if (!pBuf)
return (BadAlloc); return (BadAlloc);
if (widthBytesLine == 0) if (widthBytesLine == 0)
@ -2004,7 +2011,7 @@ DoGetImage(ClientPtr client, int format, Drawable drawable,
length += widthBytesLine; length += widthBytesLine;
} }
} }
if(!(pBuf = xalloc(length))) if(!(pBuf = xcalloc(1, length)))
return (BadAlloc); return (BadAlloc);
WriteReplyToClient(client, sizeof (xGetImageReply), &xgi); WriteReplyToClient(client, sizeof (xGetImageReply), &xgi);
} }
@ -2742,7 +2749,7 @@ ProcQueryColors(ClientPtr client)
xQueryColorsReply qcr; xQueryColorsReply qcr;
count = ((client->req_len << 2) - sizeof(xQueryColorsReq)) >> 2; count = ((client->req_len << 2) - sizeof(xQueryColorsReq)) >> 2;
prgbs = xalloc(count * sizeof(xrgb)); prgbs = xcalloc(1, count * sizeof(xrgb));
if(!prgbs && count) if(!prgbs && count)
return(BadAlloc); return(BadAlloc);
if( (rc = QueryColors(pcmp, count, (Pixel *)&stuff[1], prgbs)) ) if( (rc = QueryColors(pcmp, count, (Pixel *)&stuff[1], prgbs)) )
@ -2756,6 +2763,7 @@ ProcQueryColors(ClientPtr client)
return rc; return rc;
} }
} }
memset(&qcr, 0, sizeof(xQueryColorsReply));
qcr.type = X_Reply; qcr.type = X_Reply;
qcr.length = (count * sizeof(xrgb)) >> 2; qcr.length = (count * sizeof(xrgb)) >> 2;
qcr.sequenceNumber = client->sequence; qcr.sequenceNumber = client->sequence;
@ -2983,6 +2991,7 @@ ProcQueryBestSize (ClientPtr client)
return rc; return rc;
(* pScreen->QueryBestSize)(stuff->class, &stuff->width, (* pScreen->QueryBestSize)(stuff->class, &stuff->width,
&stuff->height, pScreen); &stuff->height, pScreen);
memset(&reply, 0, sizeof(xQueryBestSizeReply));
reply.type = X_Reply; reply.type = X_Reply;
reply.length = 0; reply.length = 0;
reply.sequenceNumber = client->sequence; reply.sequenceNumber = client->sequence;
@ -3696,6 +3705,7 @@ SendErrorToClient(ClientPtr client, unsigned majorCode, unsigned minorCode,
{ {
xError rep; xError rep;
memset(&rep, 0, sizeof(xError));
rep.type = X_Error; rep.type = X_Error;
rep.sequenceNumber = client->sequence; rep.sequenceNumber = client->sequence;
rep.errorCode = errorCode; rep.errorCode = errorCode;

2
dix/dixfonts.c
View File

@ -789,6 +789,7 @@ finish:
for (i = 0; i < nnames; i++) for (i = 0; i < nnames; i++)
stringLens += (names->length[i] <= 255) ? names->length[i] : 0; stringLens += (names->length[i] <= 255) ? names->length[i] : 0;
memset(&reply, 0, sizeof(xListFontsReply));
reply.type = X_Reply; reply.type = X_Reply;
reply.length = (stringLens + nnames + 3) >> 2; reply.length = (stringLens + nnames + 3) >> 2;
reply.nFonts = nnames; reply.nFonts = nnames;
@ -1044,6 +1045,7 @@ doListFontsWithInfo(ClientPtr client, LFWIclosurePtr c)
err = AllocError; err = AllocError;
break; break;
} }
memset(reply + c->length, 0, length - c->length);
c->reply = reply; c->reply = reply;
c->length = length; c->length = length;
} }

10
dix/events.c
View File

@ -2300,6 +2300,7 @@ DeliverDeviceEvents(WindowPtr pWin, xEvent *xE, GrabPtr grab,
{ {
/* no XI event delivered. Try core event */ /* no XI event delivered. Try core event */
memset(&core, 0, sizeof(xEvent));
core = *xE; core = *xE;
core.u.u.type = XItoCoreType(xE->u.u.type); core.u.u.type = XItoCoreType(xE->u.u.type);
@ -3393,6 +3394,7 @@ DeliverFocusedEvent(DeviceIntPtr keybd, xEvent *xE, WindowPtr window, int count)
if (sendCore) if (sendCore)
{ {
memset(&core, 0, sizeof(xEvent));
core = *xE; core = *xE;
core.u.u.type = XItoCoreType(xE->u.u.type); core.u.u.type = XItoCoreType(xE->u.u.type);
} }
@ -3491,6 +3493,7 @@ DeliverGrabbedEvent(xEvent *xE, DeviceIntPtr thisDev,
/* try core event */ /* try core event */
if (sendCore && grab->coreGrab) if (sendCore && grab->coreGrab)
{ {
memset(&core, 0, sizeof(xEvent));
core = *xE; core = *xE;
core.u.u.type = XItoCoreType(xE->u.u.type); core.u.u.type = XItoCoreType(xE->u.u.type);
if(core.u.u.type) { if(core.u.u.type) {
@ -3869,6 +3872,7 @@ CoreEnterLeaveEvent(
mask = pWin->eventMask | wOtherEventMasks(pWin); mask = pWin->eventMask | wOtherEventMasks(pWin);
} }
memset(&event, 0, sizeof(xEvent));
event.u.u.type = type; event.u.u.type = type;
event.u.u.detail = detail; event.u.u.detail = detail;
event.u.enterLeave.time = currentTime.milliseconds; event.u.enterLeave.time = currentTime.milliseconds;
@ -3949,6 +3953,7 @@ DeviceEnterLeaveEvent(
/* we don't have enough bytes, so we squash flags and mode into /* we don't have enough bytes, so we squash flags and mode into
one byte, and use the last byte for the deviceid. */ one byte, and use the last byte for the deviceid. */
memset(&event, 0, sizeof(xEvent));
devEnterLeave = (deviceEnterNotify*)&event; devEnterLeave = (deviceEnterNotify*)&event;
devEnterLeave->type = type; devEnterLeave->type = type;
devEnterLeave->detail = detail; devEnterLeave->detail = detail;
@ -3990,6 +3995,7 @@ CoreFocusEvent(DeviceIntPtr dev, int type, int mode, int detail, WindowPtr pWin)
{ {
xEvent event; xEvent event;
memset(&event, 0, sizeof(xEvent));
event.u.focus.mode = mode; event.u.focus.mode = mode;
event.u.u.type = type; event.u.u.type = type;
event.u.u.detail = detail; event.u.u.detail = detail;
@ -4153,6 +4159,7 @@ ProcGetInputFocus(ClientPtr client)
if (rc != Success) if (rc != Success)
return rc; return rc;
memset(&rep, 0, sizeof(xGetInputFocusReply));
rep.type = X_Reply; rep.type = X_Reply;
rep.length = 0; rep.length = 0;
rep.sequenceNumber = client->sequence; rep.sequenceNumber = client->sequence;
@ -4243,6 +4250,7 @@ ProcGrabPointer(ClientPtr client)
/* at this point, some sort of reply is guaranteed. */ /* at this point, some sort of reply is guaranteed. */
time = ClientTimeToServerTime(stuff->time); time = ClientTimeToServerTime(stuff->time);
memset(&rep, 0, sizeof(xGrabPointerReply));
rep.type = X_Reply; rep.type = X_Reply;
rep.sequenceNumber = client->sequence; rep.sequenceNumber = client->sequence;
rep.length = 0; rep.length = 0;
@ -4490,6 +4498,7 @@ ProcGrabKeyboard(ClientPtr client)
REQUEST_SIZE_MATCH(xGrabKeyboardReq); REQUEST_SIZE_MATCH(xGrabKeyboardReq);
memset(&rep, 0, sizeof(xGrabKeyboardReply));
result = GrabDevice(client, keyboard, stuff->keyboardMode, result = GrabDevice(client, keyboard, stuff->keyboardMode,
stuff->pointerMode, stuff->grabWindow, stuff->pointerMode, stuff->grabWindow,
stuff->ownerEvents, stuff->time, stuff->ownerEvents, stuff->time,
@ -4557,6 +4566,7 @@ ProcQueryPointer(ClientPtr client)
pSprite = mouse->spriteInfo->sprite; pSprite = mouse->spriteInfo->sprite;
if (mouse->valuator->motionHintWindow) if (mouse->valuator->motionHintWindow)
MaybeStopHint(mouse, client); MaybeStopHint(mouse, client);
memset(&rep, 0, sizeof(xQueryPointerReply));
rep.type = X_Reply; rep.type = X_Reply;
rep.sequenceNumber = client->sequence; rep.sequenceNumber = client->sequence;
rep.mask = mouse->button->state; rep.mask = mouse->button->state;

4
dix/extension.c
View File

@ -267,7 +267,8 @@ ProcQueryExtension(ClientPtr client)
REQUEST(xQueryExtensionReq); REQUEST(xQueryExtensionReq);
REQUEST_FIXED_SIZE(xQueryExtensionReq, stuff->nbytes); REQUEST_FIXED_SIZE(xQueryExtensionReq, stuff->nbytes);
memset(&reply, 0, sizeof(xQueryExtensionReply));
reply.type = X_Reply; reply.type = X_Reply;
reply.length = 0; reply.length = 0;
reply.major_opcode = 0; reply.major_opcode = 0;
@ -301,6 +302,7 @@ ProcListExtensions(ClientPtr client)
REQUEST_SIZE_MATCH(xReq); REQUEST_SIZE_MATCH(xReq);
memset(&reply, 0, sizeof(xListExtensionsReply));
reply.type = X_Reply; reply.type = X_Reply;
reply.nExtensions = 0; reply.nExtensions = 0;
reply.length = 0; reply.length = 0;

12
dix/main.c
View File

@ -489,8 +489,9 @@ CreateConnectionBlock(void)
sizesofar = 0; sizesofar = 0;
char *pBuf; char *pBuf;
/* Leave off the ridBase and ridMask, these must be sent with memset(&setup, 0, sizeof(xConnSetup));
/* Leave off the ridBase and ridMask, these must be sent with
connection */ connection */
setup.release = VendorRelease; setup.release = VendorRelease;
@ -529,7 +530,8 @@ CreateConnectionBlock(void)
sizesofar += i; sizesofar += i;
while (--i >= 0) while (--i >= 0)
*pBuf++ = 0; *pBuf++ = 0;
memset(&format, 0, sizeof(xPixmapFormat));
for (i=0; i<screenInfo.numPixmapFormats; i++) for (i=0; i<screenInfo.numPixmapFormats; i++)
{ {
format.depth = screenInfo.formats[i].depth; format.depth = screenInfo.formats[i].depth;
@ -541,7 +543,9 @@ CreateConnectionBlock(void)
} }
connBlockScreenStart = sizesofar; connBlockScreenStart = sizesofar;
for (i=0; i<screenInfo.numScreens; i++) memset(&depth, 0, sizeof(xDepth));
memset(&visual, 0, sizeof(xVisualType));
for (i=0; i<screenInfo.numScreens; i++)
{ {
ScreenPtr pScreen; ScreenPtr pScreen;
DepthPtr pDepth; DepthPtr pDepth;

2
dix/property.c
View File

@ -111,6 +111,7 @@ deliverPropertyNotifyEvent(WindowPtr pWin, int state, Atom atom)
{ {
xEvent event; xEvent event;
memset(&event, 0, sizeof(xEvent));
event.u.u.type = PropertyNotify; event.u.u.type = PropertyNotify;
event.u.property.window = pWin->drawable.id; event.u.property.window = pWin->drawable.id;
event.u.property.state = state; event.u.property.state = state;
@ -479,6 +480,7 @@ ProcGetProperty(ClientPtr client)
return(BadAtom); return(BadAtom);
} }
memset(&reply, 0, sizeof(xGetPropertyReply));
reply.type = X_Reply; reply.type = X_Reply;
reply.sequenceNumber = client->sequence; reply.sequenceNumber = client->sequence;

2
dix/selection.c
View File

@ -243,6 +243,7 @@ ProcGetSelectionOwner(ClientPtr client)
return BadAtom; return BadAtom;
} }
memset(&reply, 0, sizeof(xGetSelectionOwnerReply));
reply.type = X_Reply; reply.type = X_Reply;
reply.length = 0; reply.length = 0;
reply.sequenceNumber = client->sequence; reply.sequenceNumber = client->sequence;
@ -284,6 +285,7 @@ ProcConvertSelection(ClientPtr client)
rc = dixLookupSelection(&pSel, stuff->selection, client, DixReadAccess); rc = dixLookupSelection(&pSel, stuff->selection, client, DixReadAccess);
memset(&event, 0, sizeof(xEvent));
if (rc != Success && rc != BadMatch) if (rc != Success && rc != BadMatch)
return rc; return rc;
else if (rc == Success && pSel->window != None) { else if (rc == Success && pSel->window != None) {

17
dix/window.c
View File

@ -774,6 +774,7 @@ CreateWindow(Window wid, WindowPtr pParent, int x, int y, unsigned w,
if (SubSend(pParent)) if (SubSend(pParent))
{ {
memset(&event, 0, sizeof(xEvent));
event.u.u.type = CreateNotify; event.u.u.type = CreateNotify;
event.u.createNotify.window = wid; event.u.createNotify.window = wid;
event.u.createNotify.parent = pParent->drawable.id; event.u.createNotify.parent = pParent->drawable.id;
@ -889,9 +890,10 @@ CrushTree(WindowPtr pWin)
pParent = pChild->parent; pParent = pChild->parent;
if (SubStrSend(pChild, pParent)) if (SubStrSend(pChild, pParent))
{ {
memset(&event, 0, sizeof(xEvent));
event.u.u.type = DestroyNotify; event.u.u.type = DestroyNotify;
event.u.destroyNotify.window = pChild->drawable.id; event.u.destroyNotify.window = pChild->drawable.id;
DeliverEvents(pChild, &event, 1, NullWindow); DeliverEvents(pChild, &event, 1, NullWindow);
} }
FreeResource(pChild->drawable.id, RT_WINDOW); FreeResource(pChild->drawable.id, RT_WINDOW);
pSib = pChild->nextSib; pSib = pChild->nextSib;
@ -935,9 +937,10 @@ DeleteWindow(pointer value, XID wid)
pParent = pWin->parent; pParent = pWin->parent;
if (wid && pParent && SubStrSend(pWin, pParent)) if (wid && pParent && SubStrSend(pWin, pParent))
{ {
memset(&event, 0, sizeof(xEvent));
event.u.u.type = DestroyNotify; event.u.u.type = DestroyNotify;
event.u.destroyNotify.window = pWin->drawable.id; event.u.destroyNotify.window = pWin->drawable.id;
DeliverEvents(pWin, &event, 1, NullWindow); DeliverEvents(pWin, &event, 1, NullWindow);
} }
FreeWindowResources(pWin); FreeWindowResources(pWin);
@ -2244,6 +2247,7 @@ ConfigureWindow(WindowPtr pWin, Mask mask, XID *vlist, ClientPtr client)
(RedirectSend(pParent) (RedirectSend(pParent)
)) ))
{ {
memset(&event, 0, sizeof(xEvent));
event.u.u.type = ConfigureRequest; event.u.u.type = ConfigureRequest;
event.u.configureRequest.window = pWin->drawable.id; event.u.configureRequest.window = pWin->drawable.id;
if (mask & CWSibling) if (mask & CWSibling)
@ -2278,6 +2282,7 @@ ConfigureWindow(WindowPtr pWin, Mask mask, XID *vlist, ClientPtr client)
if (size_change && ((pWin->eventMask|wOtherEventMasks(pWin)) & ResizeRedirectMask)) if (size_change && ((pWin->eventMask|wOtherEventMasks(pWin)) & ResizeRedirectMask))
{ {
xEvent eventT; xEvent eventT;
memset(&eventT, 0, sizeof(xEvent));
eventT.u.u.type = ResizeRequest; eventT.u.u.type = ResizeRequest;
eventT.u.resizeRequest.window = pWin->drawable.id; eventT.u.resizeRequest.window = pWin->drawable.id;
eventT.u.resizeRequest.width = w; eventT.u.resizeRequest.width = w;
@ -2324,6 +2329,7 @@ ConfigureWindow(WindowPtr pWin, Mask mask, XID *vlist, ClientPtr client)
ActuallyDoSomething: ActuallyDoSomething:
if (SubStrSend(pWin, pParent)) if (SubStrSend(pWin, pParent))
{ {
memset(&event, 0, sizeof(xEvent));
event.u.u.type = ConfigureNotify; event.u.u.type = ConfigureNotify;
event.u.configureNotify.window = pWin->drawable.id; event.u.configureNotify.window = pWin->drawable.id;
if (pSib) if (pSib)
@ -2480,6 +2486,7 @@ ReparentWindow(WindowPtr pWin, WindowPtr pParent,
if (WasMapped) if (WasMapped)
UnmapWindow(pWin, FALSE); UnmapWindow(pWin, FALSE);
memset(&event, 0, sizeof(xEvent));
event.u.u.type = ReparentNotify; event.u.u.type = ReparentNotify;
event.u.reparent.window = pWin->drawable.id; event.u.reparent.window = pWin->drawable.id;
event.u.reparent.parent = pParent->drawable.id; event.u.reparent.parent = pParent->drawable.id;
@ -2640,6 +2647,7 @@ MapWindow(WindowPtr pWin, ClientPtr client)
(RedirectSend(pParent) (RedirectSend(pParent)
)) ))
{ {
memset(&event, 0, sizeof(xEvent));
event.u.u.type = MapRequest; event.u.u.type = MapRequest;
event.u.mapRequest.window = pWin->drawable.id; event.u.mapRequest.window = pWin->drawable.id;
event.u.mapRequest.parent = pParent->drawable.id; event.u.mapRequest.parent = pParent->drawable.id;
@ -2652,6 +2660,7 @@ MapWindow(WindowPtr pWin, ClientPtr client)
pWin->mapped = TRUE; pWin->mapped = TRUE;
if (SubStrSend(pWin, pParent) && MapUnmapEventsEnabled(pWin)) if (SubStrSend(pWin, pParent) && MapUnmapEventsEnabled(pWin))
{ {
memset(&event, 0, sizeof(xEvent));
event.u.u.type = MapNotify; event.u.u.type = MapNotify;
event.u.mapNotify.window = pWin->drawable.id; event.u.mapNotify.window = pWin->drawable.id;
event.u.mapNotify.override = pWin->overrideRedirect; event.u.mapNotify.override = pWin->overrideRedirect;
@ -2726,6 +2735,7 @@ MapSubwindows(WindowPtr pParent, ClientPtr client)
{ {
if (parentRedirect && !pWin->overrideRedirect) if (parentRedirect && !pWin->overrideRedirect)
{ {
memset(&event, 0, sizeof(xEvent));
event.u.u.type = MapRequest; event.u.u.type = MapRequest;
event.u.mapRequest.window = pWin->drawable.id; event.u.mapRequest.window = pWin->drawable.id;
event.u.mapRequest.parent = pParent->drawable.id; event.u.mapRequest.parent = pParent->drawable.id;
@ -2738,6 +2748,7 @@ MapSubwindows(WindowPtr pParent, ClientPtr client)
pWin->mapped = TRUE; pWin->mapped = TRUE;
if (parentNotify || StrSend(pWin)) if (parentNotify || StrSend(pWin))
{ {
memset(&event, 0, sizeof(xEvent));
event.u.u.type = MapNotify; event.u.u.type = MapNotify;
event.u.mapNotify.window = pWin->drawable.id; event.u.mapNotify.window = pWin->drawable.id;
event.u.mapNotify.override = pWin->overrideRedirect; event.u.mapNotify.override = pWin->overrideRedirect;
@ -2850,6 +2861,7 @@ UnmapWindow(WindowPtr pWin, Bool fromConfigure)
return(Success); return(Success);
if (SubStrSend(pWin, pParent) && MapUnmapEventsEnabled(pWin)) if (SubStrSend(pWin, pParent) && MapUnmapEventsEnabled(pWin))
{ {
memset(&event, 0, sizeof(xEvent));
event.u.u.type = UnmapNotify; event.u.u.type = UnmapNotify;
event.u.unmapNotify.window = pWin->drawable.id; event.u.unmapNotify.window = pWin->drawable.id;
event.u.unmapNotify.fromConfigure = fromConfigure; event.u.unmapNotify.fromConfigure = fromConfigure;
@ -3113,6 +3125,7 @@ SendVisibilityNotify(WindowPtr pWin)
} }
#endif #endif
memset(&event, 0, sizeof(xEvent));
event.u.u.type = VisibilityNotify; event.u.u.type = VisibilityNotify;
event.u.visibility.window = pWin->drawable.id; event.u.visibility.window = pWin->drawable.id;
event.u.visibility.state = visibility; event.u.visibility.state = visibility;

3
mi/miexpose.c
View File

@ -381,6 +381,7 @@ miSendGraphicsExpose (ClientPtr client, RegionPtr pRgn, XID drawable,
else else
{ {
xEvent event; xEvent event;
memset(&event, 0, sizeof(xEvent));
event.u.u.type = NoExpose; event.u.u.type = NoExpose;
event.u.noExposure.drawable = drawable; event.u.noExposure.drawable = drawable;
event.u.noExposure.majorEvent = major; event.u.noExposure.majorEvent = major;
@ -401,7 +402,7 @@ miSendExposures( WindowPtr pWin, RegionPtr pRgn, int dx, int dy)
pBox = REGION_RECTS(pRgn); pBox = REGION_RECTS(pRgn);
numRects = REGION_NUM_RECTS(pRgn); numRects = REGION_NUM_RECTS(pRgn);
if(!(pEvent = xalloc(numRects * sizeof(xEvent)))) if(!(pEvent = xcalloc(1, numRects * sizeof(xEvent))))
return; return;
for (i=numRects, pe = pEvent; --i >= 0; pe++, pBox++) for (i=numRects, pe = pEvent; --i >= 0; pe++, pBox++)

3
randr/rrxinerama.c
View File

@ -245,7 +245,8 @@ ProcRRXineramaIsActive(ClientPtr client)
xXineramaIsActiveReply rep; xXineramaIsActiveReply rep;
REQUEST_SIZE_MATCH(xXineramaIsActiveReq); REQUEST_SIZE_MATCH(xXineramaIsActiveReq);
memset(&rep, 0, sizeof(xXineramaIsActiveReply));
rep.type = X_Reply; rep.type = X_Reply;
rep.length = 0; rep.length = 0;
rep.sequenceNumber = client->sequence; rep.sequenceNumber = client->sequence;

3
render/render.c
View File

@ -266,6 +266,7 @@ ProcRenderQueryVersion (ClientPtr client)
pRenderClient->minor_version = stuff->minorVersion; pRenderClient->minor_version = stuff->minorVersion;
REQUEST_SIZE_MATCH(xRenderQueryVersionReq); REQUEST_SIZE_MATCH(xRenderQueryVersionReq);
memset(&rep, 0, sizeof(xRenderQueryVersionReply));
rep.type = X_Reply; rep.type = X_Reply;
rep.length = 0; rep.length = 0;
rep.sequenceNumber = client->sequence; rep.sequenceNumber = client->sequence;
@ -363,7 +364,7 @@ ProcRenderQueryPictFormats (ClientPtr client)
ndepth * sizeof (xPictDepth) + ndepth * sizeof (xPictDepth) +
nvisual * sizeof (xPictVisual) + nvisual * sizeof (xPictVisual) +
numSubpixel * sizeof (CARD32)); numSubpixel * sizeof (CARD32));
reply = (xRenderQueryPictFormatsReply *) xalloc (rlength); reply = (xRenderQueryPictFormatsReply *) xcalloc (1, rlength);
if (!reply) if (!reply)
return BadAlloc; return BadAlloc;
reply->type = X_Reply; reply->type = X_Reply;

1
xfixes/select.c
View File

@ -83,6 +83,7 @@ XFixesSelectionCallback (CallbackListPtr *callbacks, pointer data, pointer args)
{ {
xXFixesSelectionNotifyEvent ev; xXFixesSelectionNotifyEvent ev;
memset(&ev, 0, sizeof(xXFixesSelectionNotifyEvent));
ev.type = XFixesEventBase + XFixesSelectionNotify; ev.type = XFixesEventBase + XFixesSelectionNotify;
ev.subtype = subtype; ev.subtype = subtype;
ev.sequenceNumber = e->pClient->sequence; ev.sequenceNumber = e->pClient->sequence;

1
xfixes/xfixes.c
View File

@ -69,6 +69,7 @@ ProcXFixesQueryVersion(ClientPtr client)
REQUEST(xXFixesQueryVersionReq); REQUEST(xXFixesQueryVersionReq);
REQUEST_SIZE_MATCH(xXFixesQueryVersionReq); REQUEST_SIZE_MATCH(xXFixesQueryVersionReq);
memset(&rep, 0, sizeof(xXFixesQueryVersionReply));
rep.type = X_Reply; rep.type = X_Reply;
rep.length = 0; rep.length = 0;
rep.sequenceNumber = client->sequence; rep.sequenceNumber = client->sequence;

5
xkb/xkb.c
View File

@ -179,6 +179,7 @@ ProcXkbUseExtension(ClientPtr client)
stuff->wantedMajor,stuff->wantedMinor, stuff->wantedMajor,stuff->wantedMinor,
XkbMajorVersion,XkbMinorVersion); XkbMajorVersion,XkbMinorVersion);
} }
memset(&rep, 0, sizeof(xkbUseExtensionReply));
rep.type = X_Reply; rep.type = X_Reply;
rep.supported = supported; rep.supported = supported;
rep.length = 0; rep.length = 0;
@ -1363,7 +1364,7 @@ unsigned i,len;
char *desc,*start; char *desc,*start;
len= (rep->length*4)-(SIZEOF(xkbGetMapReply)-SIZEOF(xGenericReply)); len= (rep->length*4)-(SIZEOF(xkbGetMapReply)-SIZEOF(xGenericReply));
start= desc= (char *)xalloc(len); start= desc= (char *)xcalloc(1, len);
if (!start) if (!start)
return BadAlloc; return BadAlloc;
if ( rep->nTypes>0 ) if ( rep->nTypes>0 )
@ -3773,6 +3774,7 @@ ProcXkbGetNames(ClientPtr client)
CHK_MASK_LEGAL(0x01,stuff->which,XkbAllNamesMask); CHK_MASK_LEGAL(0x01,stuff->which,XkbAllNamesMask);
xkb = dev->key->xkbInfo->desc; xkb = dev->key->xkbInfo->desc;
memset(&rep, 0, sizeof(xkbGetNamesReply));
rep.type= X_Reply; rep.type= X_Reply;
rep.sequenceNumber= client->sequence; rep.sequenceNumber= client->sequence;
rep.length = 0; rep.length = 0;
@ -5353,6 +5355,7 @@ ProcXkbPerClientFlags(ClientPtr client)
CHK_MASK_MATCH(0x02,stuff->change,stuff->value); CHK_MASK_MATCH(0x02,stuff->change,stuff->value);
interest = XkbFindClientResource((DevicePtr)dev,client); interest = XkbFindClientResource((DevicePtr)dev,client);
memset(&rep, 0, sizeof(xkbPerClientFlagsReply));
rep.type= X_Reply; rep.type= X_Reply;
rep.length = 0; rep.length = 0;
rep.sequenceNumber = client->sequence; rep.sequenceNumber = client->sequence;

6
xkb/xkbEvents.c
View File

@ -838,6 +838,7 @@ XkbSrvLedInfoPtr sli;
} }
if (pChanges->map.changed) { if (pChanges->map.changed) {
xkbMapNotify mn; xkbMapNotify mn;
memset(&mn, 0, sizeof(xkbMapNotify));
mn.changed= pChanges->map.changed; mn.changed= pChanges->map.changed;
mn.firstType= pChanges->map.first_type; mn.firstType= pChanges->map.first_type;
mn.nTypes= pChanges->map.num_types; mn.nTypes= pChanges->map.num_types;
@ -859,6 +860,7 @@ XkbSrvLedInfoPtr sli;
if ((pChanges->ctrls.changed_ctrls)|| if ((pChanges->ctrls.changed_ctrls)||
(pChanges->ctrls.enabled_ctrls_changes)) { (pChanges->ctrls.enabled_ctrls_changes)) {
xkbControlsNotify cn; xkbControlsNotify cn;
memset(&cn, 0, sizeof(xkbControlsNotify));
cn.changedControls= pChanges->ctrls.changed_ctrls; cn.changedControls= pChanges->ctrls.changed_ctrls;
cn.enabledControlChanges= pChanges->ctrls.enabled_ctrls_changes; cn.enabledControlChanges= pChanges->ctrls.enabled_ctrls_changes;
cn.keycode= cause->kc; cn.keycode= cause->kc;
@ -871,6 +873,7 @@ XkbSrvLedInfoPtr sli;
xkbIndicatorNotify in; xkbIndicatorNotify in;
if (sli==NULL) if (sli==NULL)
sli= XkbFindSrvLedInfo(kbd,XkbDfltXIClass,XkbDfltXIId,0); sli= XkbFindSrvLedInfo(kbd,XkbDfltXIClass,XkbDfltXIId,0);
memset(&in, 0, sizeof(xkbIndicatorNotify));
in.state= sli->effectiveState; in.state= sli->effectiveState;
in.changed= pChanges->indicators.map_changes; in.changed= pChanges->indicators.map_changes;
XkbSendIndicatorNotify(kbd,XkbIndicatorMapNotify,&in); XkbSendIndicatorNotify(kbd,XkbIndicatorMapNotify,&in);
@ -879,12 +882,14 @@ XkbSrvLedInfoPtr sli;
xkbIndicatorNotify in; xkbIndicatorNotify in;
if (sli==NULL) if (sli==NULL)
sli= XkbFindSrvLedInfo(kbd,XkbDfltXIClass,XkbDfltXIId,0); sli= XkbFindSrvLedInfo(kbd,XkbDfltXIClass,XkbDfltXIId,0);
memset(&in, 0, sizeof(xkbIndicatorNotify));
in.state= sli->effectiveState; in.state= sli->effectiveState;
in.changed= pChanges->indicators.state_changes; in.changed= pChanges->indicators.state_changes;
XkbSendIndicatorNotify(kbd,XkbIndicatorStateNotify,&in); XkbSendIndicatorNotify(kbd,XkbIndicatorStateNotify,&in);
} }
if (pChanges->names.changed) { if (pChanges->names.changed) {
xkbNamesNotify nn; xkbNamesNotify nn;
memset(&nn, 0, sizeof(xkbNamesNotify));
nn.changed= pChanges->names.changed; nn.changed= pChanges->names.changed;
nn.firstType= pChanges->names.first_type; nn.firstType= pChanges->names.first_type;
nn.nTypes= pChanges->names.num_types; nn.nTypes= pChanges->names.num_types;
@ -897,6 +902,7 @@ XkbSrvLedInfoPtr sli;
} }
if ((pChanges->compat.changed_groups)||(pChanges->compat.num_si>0)) { if ((pChanges->compat.changed_groups)||(pChanges->compat.num_si>0)) {
xkbCompatMapNotify cmn; xkbCompatMapNotify cmn;
memset(&cmn, 0, sizeof(xkbCompatMapNotify));
cmn.changedGroups= pChanges->compat.changed_groups; cmn.changedGroups= pChanges->compat.changed_groups;
cmn.firstSI= pChanges->compat.first_si; cmn.firstSI= pChanges->compat.first_si;
cmn.nSI= pChanges->compat.num_si; cmn.nSI= pChanges->compat.num_si;

1
xkb/xkbUtils.c
View File

@ -2097,6 +2097,7 @@ XkbCopyDeviceKeymap(DeviceIntPtr dst, DeviceIntPtr src)
if (!dst->key || !src->key) if (!dst->key || !src->key)
return FALSE; return FALSE;
memset(&nkn, 0, sizeof(xkbNewKeyboardNotify));
nkn.oldMinKeyCode = dst->key->xkbInfo->desc->min_key_code; nkn.oldMinKeyCode = dst->key->xkbInfo->desc->min_key_code;
nkn.oldMaxKeyCode = dst->key->xkbInfo->desc->max_key_code; nkn.oldMaxKeyCode = dst->key->xkbInfo->desc->max_key_code;
nkn.deviceID = dst->id; nkn.deviceID = dst->id;