This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.11-199-g247fdf2
- From: drepper at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 11 Feb 2010 04:32:35 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.11-199-g247fdf2
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 247fdf2e2b798378d8aeaac1ee6f4ba0a49f31f3 (commit)
from 311927f1bd58b6e2b36e3bbb83bbc4dbdb507155 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=247fdf2e2b798378d8aeaac1ee6f4ba0a49f31f3
commit 247fdf2e2b798378d8aeaac1ee6f4ba0a49f31f3
Author: Ulrich Drepper <drepper@redhat.com>
Date: Wed Feb 10 20:31:48 2010 -0800
Fix file descriotor leak in nftw with FTW_CHDIR
diff --git a/ChangeLog b/ChangeLog
index 4e84709..be8ba29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/io/ftw.c b/io/ftw.c
index 9cc0907..bb7dba8 100644
--- a/io/ftw.c
+++ b/io/ftw.c
@@ -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)
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
io/ftw.c | 3 ++-
2 files changed, 8 insertions(+), 1 deletions(-)
hooks/post-receive
--
GNU C Library master sources