Audit malloc(3)/calloc(3)/realloc(3) usage.

First committed to wrong branch, sorry.

diff --git a/cgi.c b/cgi.c
index 35b20160690920241a7ec947fae8e2de598b5edd..53fd21caef40d4f7eced33f6ab981e131ddca5ca 100644 (file)
--- a/cgi.c
+++ b/cgi.c
@@ -1,4 +1,4 @@
-/*     $Id: cgi.c,v 1.50 2014/03/23 12:19:03 schwarze Exp $ */
+/*     $Id: cgi.c,v 1.51 2014/04/23 21:40:47 schwarze Exp $ */

 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  *
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  *


@@ -936,7 +936,7 @@ pg_search(const struct req *req, char *path)
                ep++;
 
        while (ep && '\0' != *ep) {
                ep++;
 
        while (ep && '\0' != *ep) {

-               cp = mandoc_realloc(cp, (sz + 1) * sizeof(char *));
+               cp = mandoc_reallocarray(cp, sz + 1, sizeof(char *));

                start = ep;
                while ('\0' != *ep && ! isspace((unsigned char)*ep))
                        ep++;
                start = ep;
                while ('\0' != *ep && ! isspace((unsigned char)*ep))
                        ep++;


@@ -1180,9 +1180,8 @@ pathgen(DIR *dir, char *path, struct req *req)
        if (rc > 0) {
                /* This also strips the trailing slash. */
                path[(int)--sz] = '\0';
        if (rc > 0) {
                /* This also strips the trailing slash. */
                path[(int)--sz] = '\0';

-               req->p = mandoc_realloc
-                       (req->p, 
-                        (req->psz + 1) * sizeof(struct paths));
+               req->p = mandoc_reallocarray(req->p, 
+                   req->psz + 1, sizeof(struct paths));

                /*
                 * Strip out the leading "./" unless we're just a ".",
                 * in which case use an empty string as our name.
                /*
                 * Strip out the leading "./" unless we're just a ".",
                 * in which case use an empty string as our name.