diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2019-02-28 23:11:23 +0100 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2019-02-28 23:11:23 +0100 |
| commit | c81a45785970aa198736d8dc578beb2d7bbd1b2f (patch) | |
| tree | ac76fbaa64eb26f0a1cf7863a7eca6bff9ceb9a6 /nx-X11/programs/Xserver/xfixes | |
| parent | a70e36c8114c0358258e8c3964b9d897884e265e (diff) | |
| download | nx-libs-c81a45785970aa198736d8dc578beb2d7bbd1b2f.tar.gz nx-libs-c81a45785970aa198736d8dc578beb2d7bbd1b2f.tar.bz2 nx-libs-c81a45785970aa198736d8dc578beb2d7bbd1b2f.zip | |
Use calloc to zero fill buffers being allocated for replies & events
commit cdf5bcd420e5bcf4a4a24a275d3133a4e16ce41e
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jul 9 19:12:42 2012 -0700
Use calloc to zero fill buffers being allocated for replies & events
Ensures padding bytes are zero-filled
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Tested-by: Daniel Stone <daniel@fooishbar.org>
Attributes ArcticaProject/nx-libs#382
Diffstat (limited to 'nx-X11/programs/Xserver/xfixes')
| -rw-r--r-- | nx-X11/programs/Xserver/xfixes/cursor.c | 8 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/xfixes/region.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/xfixes/cursor.c b/nx-X11/programs/Xserver/xfixes/cursor.c index 152bda500..b80bd90d6 100644 --- a/nx-X11/programs/Xserver/xfixes/cursor.c +++ b/nx-X11/programs/Xserver/xfixes/cursor.c @@ -364,8 +364,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; @@ -508,8 +508,8 @@ ProcXFixesGetCursorImageAndName (ClientPtr client) name = pCursor->name ? NameForAtom (pCursor->name) : ""; nbytes = strlen (name); nbytesRound = (nbytes + 3) & ~3; - rep = malloc (sizeof (xXFixesGetCursorImageAndNameReply) + - npixels * sizeof (CARD32) + nbytesRound); + rep = calloc (sizeof (xXFixesGetCursorImageAndNameReply) + + npixels * sizeof (CARD32) + nbytesRound, 1); if (!rep) return BadAlloc; diff --git a/nx-X11/programs/Xserver/xfixes/region.c b/nx-X11/programs/Xserver/xfixes/region.c index ba8c62835..849df6869 100644 --- a/nx-X11/programs/Xserver/xfixes/region.c +++ b/nx-X11/programs/Xserver/xfixes/region.c @@ -570,8 +570,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; |