tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-28 00:04:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream commit

Browse Source 
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
This commit is contained in:
Damien Miller 2019-11-15 16:02:43 +11:00
parent fd37cdeafe
commit a16f748690
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openbsd-compat/glob.c
View File

@ -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 * Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.
@ -968,14 +968,12 @@ globfree(glob_t *pglob)
if (pglob->gl_pathv != NULL) { if (pglob->gl_pathv != NULL) {
pp = pglob->gl_pathv + pglob->gl_offs; pp = pglob->gl_pathv + pglob->gl_offs;
for (i = pglob->gl_pathc; i--; ++pp) for (i = pglob->gl_pathc; i--; ++pp)
if (*pp)
free(*pp); free(*pp);
free(pglob->gl_pathv); free(pglob->gl_pathv);
pglob->gl_pathv = NULL; pglob->gl_pathv = NULL;
} }
if (pglob->gl_statv != NULL) { if (pglob->gl_statv != NULL) {
for (i = 0; i < pglob->gl_pathc; i++) { 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); free(pglob->gl_statv);