diff options
| author | Damien Miller <djm@mindrot.org> | 2019-11-15 16:02:43 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2019-11-15 16:02:43 +1100 |
| commit | a16f748690139b9f452485d97511ad5e578f59b2 (patch) | |
| tree | 4c3d8f882fc07737808ded06e2e285d2e5404c70 /openbsd-compat/glob.c | |
| parent | fd37cdeafe25adfcdc752280f535d28de7997ff1 (diff) | |
upstream commit
revision 1.44
date: 2015/09/14 16:09:13; author: tedu; state: Exp; lines: +3 -5; commitid: iWfSX2BIn0sLw62l;
remove null check before free. from Michael McConville
ok semarie
Diffstat (limited to 'openbsd-compat/glob.c')
| -rw-r--r-- | openbsd-compat/glob.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/openbsd-compat/glob.c b/openbsd-compat/glob.c index d4e052fa..7409b96e 100644 --- a/openbsd-compat/glob.c +++ b/openbsd-compat/glob.c @@ -1,4 +1,4 @@ -/* $OpenBSD: glob.c,v 1.43 2015/06/13 16:57:04 deraadt Exp $ */ +/* $OpenBSD: glob.c,v 1.44 2015/09/14 16:09:13 tedu Exp $ */ /* * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. @@ -968,15 +968,13 @@ globfree(glob_t *pglob) if (pglob->gl_pathv != NULL) { pp = pglob->gl_pathv + pglob->gl_offs; for (i = pglob->gl_pathc; i--; ++pp) - if (*pp) - free(*pp); + free(*pp); free(pglob->gl_pathv); pglob->gl_pathv = NULL; } if (pglob->gl_statv != NULL) { for (i = 0; i < pglob->gl_pathc; i++) { - if (pglob->gl_statv[i] != NULL) - free(pglob->gl_statv[i]); + free(pglob->gl_statv[i]); } free(pglob->gl_statv); pglob->gl_statv = NULL; |