summaryrefslogtreecommitdiff
path: root/openbsd-compat/glob.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-03-19 19:00:09 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-03-19 19:00:09 +0000
commit11c78f81199f191e19b8e8658a3f6dee22689c2e (patch)
treee1c9b0da97379d98d3b54ee82567dcfeb9d3c016 /openbsd-compat/glob.c
parenta77d641cea5fc64707bf4a27a7bff8bbb8450c69 (diff)
- (bal) glob.c update to set gl_pathv to NULL (OpenBSD CVS).
Diffstat (limited to 'openbsd-compat/glob.c')
-rw-r--r--openbsd-compat/glob.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/openbsd-compat/glob.c b/openbsd-compat/glob.c
index b42cedb79..3c3a19131 100644
--- a/openbsd-compat/glob.c
+++ b/openbsd-compat/glob.c
@@ -44,7 +44,7 @@
44#if 0 44#if 0
45static char sccsid[] = "@(#)glob.c 8.3 (Berkeley) 10/13/93"; 45static char sccsid[] = "@(#)glob.c 8.3 (Berkeley) 10/13/93";
46#else 46#else
47static char rcsid[] = "$OpenBSD: glob.c,v 1.9 2001/03/18 17:18:58 deraadt Exp $"; 47static char rcsid[] = "$OpenBSD: glob.c,v 1.10 2001/03/19 13:45:30 millert Exp $";
48#endif 48#endif
49#endif /* LIBC_SCCS and not lint */ 49#endif /* LIBC_SCCS and not lint */
50 50
@@ -663,8 +663,10 @@ globextend(path, pglob, limitp)
663 pathv = pglob->gl_pathv ? realloc((char *)pglob->gl_pathv, newsize) : 663 pathv = pglob->gl_pathv ? realloc((char *)pglob->gl_pathv, newsize) :
664 malloc(newsize); 664 malloc(newsize);
665 if (pathv == NULL) { 665 if (pathv == NULL) {
666 if (pglob->gl_pathv) 666 if (pglob->gl_pathv) {
667 free(pglob->gl_pathv); 667 free(pglob->gl_pathv);
668 pglob->gl_pathv = NULL;
669 }
668 return(GLOB_NOSPACE); 670 return(GLOB_NOSPACE);
669 } 671 }
670 672
@@ -761,6 +763,7 @@ globfree(pglob)
761 if (*pp) 763 if (*pp)
762 free(*pp); 764 free(*pp);
763 free(pglob->gl_pathv); 765 free(pglob->gl_pathv);
766 pglob->gl_pathv = NULL;
764 } 767 }
765} 768}
766 769