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

[mandoc.git] / cgi.c

diff --git a/cgi.c b/cgi.c
index cc9663c8922834ee00c2d0f57b1f0ea4b601fced..53fd21caef40d4f7eced33f6ab981e131ddca5ca 100644 (file)
--- a/cgi.c
+++ b/cgi.c
@@ -1,4 +1,4 @@
-/*     $Id: cgi.c,v 1.47 2014/01/05 20:41:04 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>
  *
@@ -43,6 +43,7 @@
 
 #include "apropos_db.h"
 #include "mandoc.h"
+#include "mandoc_aux.h"
 #include "mdoc.h"
 #include "man.h"
 #include "main.h"
@@ -739,7 +740,7 @@ format(const struct req *req, const char *file)
                return;
        }
 
-       mp = mparse_alloc(MPARSE_AUTO, MANDOCLEVEL_FATAL, NULL, NULL, 0);
+       mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_FATAL, NULL, NULL);
        rc = mparse_readfd(mp, fd, file);
        close(fd);
 
@@ -753,7 +754,7 @@ format(const struct req *req, const char *file)
                        /*"includes=/cgi-bin/man.cgi/usr/include/%%I"*/,
                        progname);
 
-       mparse_result(mp, &mdoc, &man);
+       mparse_result(mp, &mdoc, &man, NULL);
        if (NULL == man && NULL == mdoc) {
                resp_baddb();
                mparse_free(mp);
@@ -935,7 +936,7 @@ pg_search(const struct req *req, char *path)
                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++;
@@ -1179,9 +1180,8 @@ pathgen(DIR *dir, char *path, struct req *req)
        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.