diff options
| -rw-r--r-- | Xext/sync.c | 2 | ||||
| -rw-r--r-- | Xext/xf86bigfont.c | 2 | ||||
| -rw-r--r-- | glx/glxcmds.c | 4 | ||||
| -rw-r--r-- | hw/xfree86/dixmods/extmod/xf86vmode.c | 2 | ||||
| -rw-r--r-- | mi/miexpose.c | 2 | ||||
| -rw-r--r-- | randr/rrcrtc.c | 2 | ||||
| -rw-r--r-- | render/render.c | 4 | ||||
| -rw-r--r-- | xfixes/cursor.c | 7 | ||||
| -rw-r--r-- | xfixes/region.c | 3 |
9 files changed, 15 insertions, 13 deletions
diff --git a/Xext/sync.c b/Xext/sync.c index 6dc4c5e76..fc712cd2e 100644 --- a/Xext/sync.c +++ b/Xext/sync.c @@ -475,7 +475,7 @@ SyncSendCounterNotifyEvents(ClientPtr client, SyncAwait ** ppAwait, if (client->clientGone) return; - pev = pEvents = malloc(num_events * sizeof(xSyncCounterNotifyEvent)); + pev = pEvents = calloc(num_events, sizeof(xSyncCounterNotifyEvent)); if (!pEvents) return; UpdateCurrentTime(); diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c index 3a1e1b288..a90286135 100644 --- a/Xext/xf86bigfont.c +++ b/Xext/xf86bigfont.c @@ -554,7 +554,7 @@ ProcXF86BigfontQueryFont(ClientPtr client) ? nUniqCharInfos * sizeof(xCharInfo) + (nCharInfos + 1) / 2 * 2 * sizeof(CARD16) : 0); - xXF86BigfontQueryFontReply *reply = malloc(rlength); + xXF86BigfontQueryFontReply *reply = calloc(1, rlength); char *p; if (!reply) { diff --git a/glx/glxcmds.c b/glx/glxcmds.c index 9cb9e735b..c1c836fe9 100644 --- a/glx/glxcmds.c +++ b/glx/glxcmds.c @@ -2315,7 +2315,7 @@ __glXDisp_QueryExtensionsString(__GLXclientState * cl, GLbyte * pc) reply.n = n; /* Allocate buffer to make sure it's a multiple of 4 bytes big. */ - buf = (char *) malloc(length << 2); + buf = calloc(length, 4); if (buf == NULL) return BadAlloc; memcpy(buf, pGlxScreen->GLXextensions, n); @@ -2375,7 +2375,7 @@ __glXDisp_QueryServerString(__GLXclientState * cl, GLbyte * pc) reply.length = length; reply.n = n; - buf = (char *) malloc(length << 2); + buf = calloc(length, 4); if (buf == NULL) { return BadAlloc; } diff --git a/hw/xfree86/dixmods/extmod/xf86vmode.c b/hw/xfree86/dixmods/extmod/xf86vmode.c index 2fdf9e918..0435cb6d2 100644 --- a/hw/xfree86/dixmods/extmod/xf86vmode.c +++ b/hw/xfree86/dixmods/extmod/xf86vmode.c @@ -1354,7 +1354,7 @@ ProcXF86VidModeGetDotClocks(ClientPtr client) rep.flags = 0; if (!ClockProg) { - Clocks = malloc(numClocks * sizeof(int)); + Clocks = calloc(numClocks, sizeof(int)); if (!Clocks) return BadValue; if (!VidModeGetClocks(stuff->screen, Clocks)) { diff --git a/mi/miexpose.c b/mi/miexpose.c index dbb29ca4a..2dc465d9c 100644 --- a/mi/miexpose.c +++ b/mi/miexpose.c @@ -327,7 +327,7 @@ miSendGraphicsExpose(ClientPtr client, RegionPtr pRgn, XID drawable, numRects = RegionNumRects(pRgn); pBox = RegionRects(pRgn); - if (!(pEvent = malloc(numRects * sizeof(xEvent)))) + if (!(pEvent = calloc(numRects, sizeof(xEvent)))) return; pe = pEvent; diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c index ee29f37a3..c91c7fdf9 100644 --- a/randr/rrcrtc.c +++ b/randr/rrcrtc.c @@ -1526,7 +1526,7 @@ ProcRRGetCrtcTransform(ClientPtr client) nextra = (transform_filter_length(pending) + transform_filter_length(current)); - reply = malloc(sizeof(xRRGetCrtcTransformReply) + nextra); + reply = calloc(1, sizeof(xRRGetCrtcTransformReply) + nextra); if (!reply) return BadAlloc; diff --git a/render/render.c b/render/render.c index be7d21e86..3bf070268 100644 --- a/render/render.c +++ b/render/render.c @@ -531,7 +531,7 @@ ProcRenderQueryPictIndexValues(ClientPtr client) num = pFormat->index.nvalues; rlength = (sizeof(xRenderQueryPictIndexValuesReply) + num * sizeof(xIndexValue)); - reply = (xRenderQueryPictIndexValuesReply *) malloc(rlength); + reply = (xRenderQueryPictIndexValuesReply *) calloc(1, rlength); if (!reply) return BadAlloc; @@ -1688,7 +1688,7 @@ ProcRenderQueryFilters(ClientPtr client) } len = ((nnames + 1) >> 1) + bytes_to_int32(nbytesName); total_bytes = sizeof(xRenderQueryFiltersReply) + (len << 2); - reply = (xRenderQueryFiltersReply *) malloc(total_bytes); + reply = (xRenderQueryFiltersReply *) calloc(1, total_bytes); if (!reply) return BadAlloc; aliases = (INT16 *) (reply + 1); diff --git a/xfixes/cursor.c b/xfixes/cursor.c index 79530f902..402456db0 100644 --- a/xfixes/cursor.c +++ b/xfixes/cursor.c @@ -380,7 +380,8 @@ ProcXFixesGetCursorImage(ClientPtr client) width = pCursor->bits->width; height = pCursor->bits->height; npixels = width * height; - rep = malloc(sizeof(xXFixesGetCursorImageReply) + npixels * sizeof(CARD32)); + rep = calloc(sizeof(xXFixesGetCursorImageReply) + npixels * sizeof(CARD32), + 1); if (!rep) return BadAlloc; @@ -529,8 +530,8 @@ ProcXFixesGetCursorImageAndName(ClientPtr client) name = pCursor->name ? NameForAtom(pCursor->name) : ""; nbytes = strlen(name); nbytesRound = pad_to_int32(nbytes); - rep = malloc(sizeof(xXFixesGetCursorImageAndNameReply) + - npixels * sizeof(CARD32) + nbytesRound); + rep = calloc(sizeof(xXFixesGetCursorImageAndNameReply) + + npixels * sizeof(CARD32) + nbytesRound, 1); if (!rep) return BadAlloc; diff --git a/xfixes/region.c b/xfixes/region.c index 89675e52d..0e9ca443f 100644 --- a/xfixes/region.c +++ b/xfixes/region.c @@ -557,7 +557,8 @@ ProcXFixesFetchRegion(ClientPtr client) pBox = RegionRects(pRegion); nBox = RegionNumRects(pRegion); - reply = malloc(sizeof(xXFixesFetchRegionReply) + nBox * sizeof(xRectangle)); + reply = calloc(sizeof(xXFixesFetchRegionReply) + nBox * sizeof(xRectangle), + 1); if (!reply) return BadAlloc; reply->type = X_Reply; |