diff options
| author | Damien Miller <djm@mindrot.org> | 2019-11-15 06:00:07 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2019-11-15 06:00:07 +0100 |
| commit | 2b6cba7ee2b8b36f393be739c860a9d2e5d8eb48 (patch) | |
| tree | 789679aba119a3d5c72e9ea33af4cd4681c99dbd /openbsd-compat/glob.c | |
| parent | upstream: don't consult dlopen whitelist for internal security key (diff) | |
| download | openssh-2b6cba7ee2b8b36f393be739c860a9d2e5d8eb48.tar.xz openssh-2b6cba7ee2b8b36f393be739c860a9d2e5d8eb48.zip | |
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
Diffstat (limited to 'openbsd-compat/glob.c')
| -rw-r--r-- | openbsd-compat/glob.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/openbsd-compat/glob.c b/openbsd-compat/glob.c index 9e7ff9e76..f522e6dde 100644 --- 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) { |