summaryrefslogtreecommitdiff
path: root/libc/posix
diff options
context:
space:
mode:
authorjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2008-06-20 09:26:44 +0000
committerjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2008-06-20 09:26:44 +0000
commitff3e6f618d2dd1ec6887d2f3622f20889f876e1e (patch)
tree7bd685e3543aea58e3047c5ef60fa7a841ab0e73 /libc/posix
parent96b85b5d0e370abaab4bf2d9129b6ad29d69e77a (diff)
downloadeglibc2-ff3e6f618d2dd1ec6887d2f3622f20889f876e1e.tar.gz
Merge changes between r6192 and r6403 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@6404 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/posix')
-rw-r--r--libc/posix/glob.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libc/posix/glob.c b/libc/posix/glob.c
index 464859a75..ae1b6f6e0 100644
--- a/libc/posix/glob.c
+++ b/libc/posix/glob.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2002, 2003, 2004, 2005, 2006, 2007
+/* Copyright (C) 1991-2002, 2003, 2004, 2005, 2006, 2007, 2008
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -1080,8 +1080,7 @@ globfree (pglob)
{
size_t i;
for (i = 0; i < pglob->gl_pathc; ++i)
- if (pglob->gl_pathv[pglob->gl_offs + i] != NULL)
- free (pglob->gl_pathv[pglob->gl_offs + i]);
+ free (pglob->gl_pathv[pglob->gl_offs + i]);
free (pglob->gl_pathv);
pglob->gl_pathv = NULL;
}