swap malloc(n*m) pattern for calloc(n,m)

This avoids some potential integer overflows.

diff --git a/cmd/tools/ccomps.c b/cmd/tools/ccomps.c
index 8aa79c5a0b27b1af7e5b226996d177f3708f605c..3207fb207b3326ead3d0a04a053221c62b7cf27c 100644 (file)
--- a/cmd/tools/ccomps.c
+++ b/cmd/tools/ccomps.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include "cgraph.h"
 
-#define N_NEW(n,t)       (t*)malloc((n)*sizeof(t))
+#define N_NEW(n,t)       (t*)calloc((n),sizeof(t))
 #define NEW(t)           (t*)malloc(sizeof(t))
 
 typedef struct {

diff --git a/cmd/tools/gc.c b/cmd/tools/gc.c
index 2645e73d792cef5a62fd64abde259024dd260268..5f03b2aa4150a6c87d7762347dd03a4830281b95 100644 (file)
--- a/cmd/tools/gc.c
+++ b/cmd/tools/gc.c
@@ -25,7 +25,7 @@
 #include <string.h>
 
 #define NEW(t)           (t*)malloc(sizeof(t))
-#define N_NEW(n,t)       (t*)malloc((n)*sizeof(t))
+#define N_NEW(n,t)       (t*)calloc((n),sizeof(t))
 
 #include "cgraph.h"
 #include "cghdr.h"

diff --git a/cmd/tools/gml2gv.c b/cmd/tools/gml2gv.c
index edfdf8c93336760eb97f19264cb73c803f20bee9..e3462892ba108f03cd3c7f6cce382576947c1d42 100644 (file)
--- a/cmd/tools/gml2gv.c
+++ b/cmd/tools/gml2gv.c
@@ -22,7 +22,7 @@
 
 #include <getopt.h>
 
-#define N_NEW(n,t)       (t*)malloc((n)*sizeof(t))
+#define N_NEW(n,t)       (t*)calloc((n),sizeof(t))
 
 static int Verbose;
 static char* gname = "";

diff --git a/cmd/tools/gmlparse.y b/cmd/tools/gmlparse.y
index 959d64c810fcc6bd399cfe9804e482086f849cd3..674691bf6386c3a5b8071324a60844341a91573a 100644 (file)
--- a/cmd/tools/gmlparse.y
+++ b/cmd/tools/gmlparse.y
@@ -21,7 +21,7 @@
 #include <assert.h>
 
 #define NEW(t)       (t*)malloc(sizeof(t))
-#define N_NEW(n,t)   (t*)malloc((n)*sizeof(t))
+#define N_NEW(n,t)   (t*)calloc((n),sizeof(t))
 #define RALLOC(size,ptr,type) ((type*)realloc(ptr,(size)*sizeof(type)))
 
 typedef unsigned short ushort;

diff --git a/cmd/tools/graphml2gv.c b/cmd/tools/graphml2gv.c
index e3ae1dbbac890aa91982dd1e32f71755af20445d..ea7df59ad6cbbfb18598e24d3b36870de8ce4b3f 100644 (file)
--- a/cmd/tools/graphml2gv.c
+++ b/cmd/tools/graphml2gv.c
@@ -56,7 +56,7 @@ struct slist {
 };
 
 #define NEW(t)      (t*)malloc(sizeof(t))
-#define N_NEW(n,t)  (t*)malloc((n)*sizeof(t))
+#define N_NEW(n,t)  (t*)calloc((n),sizeof(t))
 /* Round x up to next multiple of y, which is a power of 2 */
 #define ROUND2(x,y) (((x) + ((y)-1)) & ~((y)-1))
 

diff --git a/cmd/tools/gv2gxl.c b/cmd/tools/gv2gxl.c
index 89a5a2b8b0d0dc06a2b8350f539df014f3034254..78fac09f07510c5b8f5ae4c82a5d9d5d056b3f75 100644 (file)
--- a/cmd/tools/gv2gxl.c
+++ b/cmd/tools/gv2gxl.c
@@ -18,7 +18,7 @@
 #define SMALLBUF    128
 
 #define NEW(t)      (t*)malloc(sizeof(t))
-#define N_NEW(n,t)  (t*)malloc((n)*sizeof(t))
+#define N_NEW(n,t)  (t*)calloc((n),sizeof(t))
 #define EMPTY(s)       ((s == 0) || (*s == '\0'))
 #define SLEN(s)     (sizeof(s)-1)
 

diff --git a/cmd/tools/gxl2gv.c b/cmd/tools/gxl2gv.c
index bb0d67cb3185b51b90b7ba7e8f43d4acdf73d583..107f123faffe69dcff781a9021e8ba64fb4faca1 100644 (file)
--- a/cmd/tools/gxl2gv.c
+++ b/cmd/tools/gxl2gv.c
@@ -49,7 +49,7 @@ struct slist {
 };
 
 #define NEW(t)      (t*)malloc(sizeof(t))
-#define N_NEW(n,t)  (t*)malloc((n)*sizeof(t))
+#define N_NEW(n,t)  (t*)calloc((n),sizeof(t))
 /* Round x up to next multiple of y, which is a power of 2 */
 #define ROUND2(x,y) (((x) + ((y)-1)) & ~((y)-1))
 

diff --git a/cmd/tools/tred.c b/cmd/tools/tred.c
index d3917d5ba2bc0662972bb1cc83f5093fec33cfc3..cae064734743368d3f86def65ef95aca59b60e89 100644 (file)
--- a/cmd/tools/tred.c
+++ b/cmd/tools/tred.c
@@ -28,7 +28,7 @@
 #include <stdlib.h>
 
 #define NEW(t)           (t*)malloc(sizeof(t))
-#define N_NEW(n,t)       (t*)malloc((n)*sizeof(t))
+#define N_NEW(n,t)       (t*)calloc((n),sizeof(t))
 
 typedef struct {
     unsigned char on_stack;

diff --git a/lib/cgraph/agxbuf.c b/lib/cgraph/agxbuf.c
index a2a71df0109909cfe65579718a1ad19b0fa481eb..4e320670aae3181038caea283a24fbcf1171fe14 100644 (file)
--- a/lib/cgraph/agxbuf.c
+++ b/lib/cgraph/agxbuf.c
@@ -17,7 +17,7 @@
 #include <string.h>
 #include <agxbuf.h>
 
-#define N_GNEW(n,t)     (t*)malloc((n)*sizeof(t))
+#define N_GNEW(n,t)     (t*)calloc((n),sizeof(t))
 
 /* agxbinit:
  * Assume if init is non-null, hint = sizeof(init[])

diff --git a/lib/common/memory.h b/lib/common/memory.h
index 6d08dd8cf0aae70b9523bec74735688bdf4a413f..cccea10708e414f931e632762767cd63a4dba586 100644 (file)
--- a/lib/common/memory.h
+++ b/lib/common/memory.h
@@ -24,11 +24,11 @@ extern "C" {
 #endif
 
 #define NEW(t)           (t*)zmalloc(sizeof(t))
-#define N_NEW(n,t)       (t*)zmalloc((n)*sizeof(t))
+#define N_NEW(n,t)       (t*)gcalloc((n),sizeof(t))
 #define GNEW(t)          (t*)gmalloc(sizeof(t))
 
-#define N_GNEW(n,t)      (t*)gmalloc((n)*sizeof(t))
-#define N_GGNEW(n,t)      (t*)malloc((n)*sizeof(t))
+#define N_GNEW(n,t)      (t*)gcalloc((n),sizeof(t))
+#define N_GGNEW(n,t)      (t*)calloc((n),sizeof(t))
 #define ALLOC(size,ptr,type) (ptr? (type*)grealloc(ptr,(size)*sizeof(type)):(type*)gmalloc((size)*sizeof(type)))
 #define RALLOC(size,ptr,type) ((type*)grealloc(ptr,(size)*sizeof(type)))
 #define ZALLOC(size,ptr,type,osize) (ptr? (type*)zrealloc(ptr,size,sizeof(type),osize):(type*)zmalloc((size)*sizeof(type)))

diff --git a/lib/graph/agxbuf.c b/lib/graph/agxbuf.c
index 3abd8ad35de58a92329969f9e3dd0bb399190d24..14360aa94ebc78fa12a85e15d04770795d7ca71d 100644 (file)
--- a/lib/graph/agxbuf.c
+++ b/lib/graph/agxbuf.c
@@ -17,7 +17,7 @@
 #include <string.h>
 #include <agxbuf.h>
 
-#define N_GNEW(n,t)     (t*)malloc((n)*sizeof(t))
+#define N_GNEW(n,t)     (t*)calloc((n),sizeof(t))
 
 /* agxbinit:
  * Assume if init is non-null, hint = sizeof(init[])

diff --git a/lib/sparse/general.h b/lib/sparse/general.h
index 5d788051f02c4da29eb8919e99015bf657d467d5..0dd0e7c97d01dbd0ea960a2068a38a7dfe6dac06 100644 (file)
--- a/lib/sparse/general.h
+++ b/lib/sparse/general.h
@@ -41,7 +41,7 @@
 #define MALLOC malloc
 #define REALLOC realloc
 
-#define N_NEW(n,t)   (t*)malloc((n)*sizeof(t))
+#define N_NEW(n,t)   (t*)calloc((n),sizeof(t))
 #define NEW(t)       (t*)malloc(sizeof(t))
 #define MAX(a,b) ((a)>(b)?(a):b)
 #define MIN(a,b) ((a)<(b)?(a):b)

diff --git a/plugin/pango/gvgetfontlist_pango.c b/plugin/pango/gvgetfontlist_pango.c
index 3ce61364835b624c305e78fbfeba9e919ce6bfc0..d696e692f1c70143bfa36aa9fb09c19d8069e125 100644 (file)
--- a/plugin/pango/gvgetfontlist_pango.c
+++ b/plugin/pango/gvgetfontlist_pango.c
@@ -245,7 +245,7 @@ typedef struct {
 } availfont_t;
 
 #define NEW(t)          (t*)malloc(sizeof(t))
-#define N_NEW(n,t)      (t*)malloc((n)*sizeof(t))
+#define N_NEW(n,t)      (t*)calloc((n),sizeof(t))
 
 static PostscriptAlias postscript_alias[] = {
 #include "ps_font_equiv.h"