upstream commit

revision 1.41
date: 2014/10/08 05:35:27;  author: deraadt;  state: Exp;  lines: +3 -3;  commitid: JwTGarRLHQKDgPh2;
obvious realloc -> reallocarray conversion

diff --git a/openbsd-compat/glob.c b/openbsd-compat/glob.c
index 9e7ff9e7657503618688c465e767c802c4a61d5c..f522e6dde450b4f386552e3fb0f44acec9c40982 100644 (file)
--- a/openbsd-compat/glob.c
+++ b/openbsd-compat/glob.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: glob.c,v 1.40 2013/09/30 12:02:34 millert Exp $ */
+/*     $OpenBSD: glob.c,v 1.41 2014/10/08 05:35:27 deraadt Exp $ */
 /*
  * Copyright (c) 1989, 1993
  *     The Regents of the University of California.  All rights reserved.
@@ -828,7 +828,7 @@ globextend(const Char *path, glob_t *pglob, struct glob_lim *limitp,
                return(GLOB_NOSPACE);
        }
 
-       pathv = realloc(pglob->gl_pathv, newn * sizeof(*pathv));
+       pathv = reallocarray(pglob->gl_pathv, newn, sizeof(*pathv));
        if (pathv == NULL)
                goto nospace;
        if (pglob->gl_pathv == NULL && pglob->gl_offs > 0) {
@@ -840,7 +840,7 @@ globextend(const Char *path, glob_t *pglob, struct glob_lim *limitp,
        pglob->gl_pathv = pathv;
 
        if ((pglob->gl_flags & GLOB_KEEPSTAT) != 0) {
-               statv = realloc(pglob->gl_statv, newn * sizeof(*statv));
+               statv = reallocarray(pglob->gl_statv, newn, sizeof(*statv));
                if (statv == NULL)
                        goto nospace;
                if (pglob->gl_statv == NULL && pglob->gl_offs > 0) {