about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--libio/fileops.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index be25cba7f4..c427a2f96a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* fileops.c (_IO_new_file_fopen): Get fd from _IO_fileno.
+
 2011-05-17  Ulrich Drepper  <drepper@gmail.com>
 
 	[BZ #11837]
diff --git a/libio/fileops.c b/libio/fileops.c
index 2b696ab1e0..30de460391 100644
--- a/libio/fileops.c
+++ b/libio/fileops.c
@@ -348,6 +348,7 @@ _IO_new_file_fopen (fp, filename, mode, is32not64)
 #ifndef __ASSUME_O_CLOEXEC
   if ((fp->_flags2 & _IO_FLAGS2_CLOEXEC) != 0 && __have_o_cloexec <= 0)
     {
+      int fd = _IO_fileno (fp);
       if (__have_o_cloexec == 0)
 	{
 	  int flags = __fcntl (fd, F_GETFD);