Fix file descriotor leak in nftw with FTW_CHDIR

This commit is contained in:
Ulrich Drepper 2010-02-10 20:31:48 -08:00
parent 311927f1bd
commit 247fdf2e2b
2 changed files with 8 additions and 1 deletions

View File

@ -1,3 +1,9 @@
2010-02-10 Ulrich Drepper <drepper@redhat.com>
[BZ #11271]
* io/ftw.c (ftw_startup): Close descriptor for initial directory
after changing back to it.
2010-02-05 David S. Miller <davem@davemloft.net>
* elf/elf.h (R_SPARC_JMP_IREL, R_SPARC_IRELATIVE): Define.

View File

@ -1,5 +1,5 @@
/* File tree walker functions.
Copyright (C) 1996-2004, 2006, 2007, 2008 Free Software Foundation, Inc.
Copyright (C) 1996-2004, 2006-2008, 2010 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
@ -790,6 +790,7 @@ ftw_startup (const char *dir, int is_nftw, void *func, int descriptors,
{
int save_err = errno;
__fchdir (cwdfd);
close_not_cancel_no_status (cwdfd);
__set_errno (save_err);
}
else if (cwd != NULL)