[X2Go-Commits] [nx-libs] 20/54: Use calloc to zero fill buffers being allocated for replies & events

git-admin at x2go.org git-admin at x2go.org
Sun Mar 24 10:05:02 CET 2019


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository nx-libs.

commit c81a45785970aa198736d8dc578beb2d7bbd1b2f
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Thu Feb 28 23:11:23 2019 +0100

    Use calloc to zero fill buffers being allocated for replies & events
    
      commit cdf5bcd420e5bcf4a4a24a275d3133a4e16ce41e
      Author: Alan Coopersmith <alan.coopersmith at 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 at oracle.com>
        Reviewed-by: Keith Packard <keithp at keithp.com>
        Tested-by: Daniel Stone <daniel at fooishbar.org>
    
    Attributes ArcticaProject/nx-libs#382
---
 nx-X11/programs/Xserver/GL/glx/glxcmds.c | 4 ++--
 nx-X11/programs/Xserver/Xext/sync.c      | 2 +-
 nx-X11/programs/Xserver/render/render.c  | 4 ++--
 nx-X11/programs/Xserver/xfixes/cursor.c  | 8 ++++----
 nx-X11/programs/Xserver/xfixes/region.c  | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/nx-X11/programs/Xserver/GL/glx/glxcmds.c b/nx-X11/programs/Xserver/GL/glx/glxcmds.c
index 3536977..16ecdb1 100644
--- a/nx-X11/programs/Xserver/GL/glx/glxcmds.c
+++ b/nx-X11/programs/Xserver/GL/glx/glxcmds.c
@@ -2084,7 +2084,7 @@ int __glXQueryExtensionsString(__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, ptr, n);
@@ -2141,7 +2141,7 @@ int __glXQueryServerString(__GLXclientState *cl, GLbyte *pc)
     reply.length = length;
     reply.n = n;
 
-    if ((buf = (char *) malloc(length << 2)) == NULL) {
+    if ((buf = calloc(length, 4)) == NULL) {
         return BadAlloc;
     }
     memcpy(buf, ptr, n);
diff --git a/nx-X11/programs/Xserver/Xext/sync.c b/nx-X11/programs/Xserver/Xext/sync.c
index bc7cb40..00f30e4 100644
--- a/nx-X11/programs/Xserver/Xext/sync.c
+++ b/nx-X11/programs/Xserver/Xext/sync.c
@@ -590,7 +590,7 @@ SyncSendCounterNotifyEvents(client, ppAwait, num_events)
     if (client->clientGone)
 	return;
     pev = pEvents = (xSyncCounterNotifyEvent *)
-		 malloc(num_events * sizeof(xSyncCounterNotifyEvent));
+		 calloc(num_events, sizeof(xSyncCounterNotifyEvent));
     if (!pEvents) 
 	return;
     UpdateCurrentTime();
diff --git a/nx-X11/programs/Xserver/render/render.c b/nx-X11/programs/Xserver/render/render.c
index 3c1cbe5..78677b7 100644
--- a/nx-X11/programs/Xserver/render/render.c
+++ b/nx-X11/programs/Xserver/render/render.c
@@ -580,7 +580,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;
 
@@ -1746,7 +1746,7 @@ ProcRenderQueryFilters (ClientPtr client)
     }
     len = ((nnames + 1) >> 1) + ((nbytesName + 3) >> 2);
     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/nx-X11/programs/Xserver/xfixes/cursor.c b/nx-X11/programs/Xserver/xfixes/cursor.c
index 152bda5..b80bd90 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 ba8c628..849df68 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;

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git


More information about the x2go-commits mailing list