Use reallocarray() on systems that provide it

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

1 files changed, 4 insertions, 5 deletions

diff --git a/parse.c b/parse.c
index f3f569c..9727508 100644
--- a/parse.c
+++ b/parse.c
@@ -318,13 +318,12 @@ define2(const char *name, const char *val, struct inclist *file)
 
     /* Make space if it's needed */
     if (file->i_defs == NULL) {
-        file->i_defs = malloc(sizeof(struct symtab *) * SYMTABINC);
+        file->i_defs = mallocarray(SYMTABINC, sizeof(struct symtab *));
         file->i_ndefs = 0;
     }
     else if (!(file->i_ndefs % SYMTABINC))
-        file->i_defs = realloc(file->i_defs,
-                               sizeof(struct symtab *) * (file->i_ndefs +
-                                                          SYMTABINC));
+        file->i_defs = reallocarray(file->i_defs, (file->i_ndefs + SYMTABINC),
+                                    sizeof(struct symtab *));
 
     if (file->i_defs == NULL)
         fatalerr("malloc()/realloc() failure in insert_defn()\n");
@@ -474,7 +473,7 @@ merge2defines(struct inclist *file1, struct inclist *file2)
         if (deflen > 0) {
             /* make sure deflen % SYMTABINC == 0 is still true */
             deflen += (SYMTABINC - deflen % SYMTABINC) % SYMTABINC;
-            i_defs = malloc(deflen * sizeof(struct symtab *));
+            i_defs = mallocarray(deflen, sizeof(struct symtab *));
             if (i_defs == NULL)
                 return 0;
         }