From: Ulrich Drepper <drepper@redhat.com>
Date: Mon, 25 Aug 2003 22:02:03 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/glibc-2_3_3~332
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=41c26b683e8f7d2eaec65d96cb9c7eba663dcd81;p=thirdparty%2Fglibc.git

Update.

2003-08-25  Ulrich Drepper  <drepper@redhat.com>

	* libio/oldfileops.c (_IO_old_file_init): Initialize _mode field
	if the object size is large enough.
---

diff --git a/ChangeLog b/ChangeLog
index 0dd9c477c10..b3a1f5c0a90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-25  Ulrich Drepper  <drepper@redhat.com>
+
+	* libio/oldfileops.c (_IO_old_file_init): Initialize _mode field
+	if the object size is large enough.
+
 2003-08-25  Jakub Jelinek  <jakub@redhat.com>
 
 	* elf/ldconfig.c (search_dir): Treat symlink as regular file
diff --git a/libio/oldfileops.c b/libio/oldfileops.c
index 2efbadb44e8..81e41503b2c 100644
--- a/libio/oldfileops.c
+++ b/libio/oldfileops.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993,95,97,98,99,2000,2002 Free Software Foundation, Inc.
+/* Copyright (C) 1993,95,97,98,99,2000,2002,2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Per Bothner <bothner@cygnus.com>.
 
@@ -128,6 +128,15 @@ _IO_old_file_init (fp)
   fp->file._vtable_offset = ((int) sizeof (struct _IO_FILE)
 			     - (int) sizeof (struct _IO_FILE_complete));
   fp->file._fileno = -1;
+
+#if defined SHARED && defined _LIBC \
+    && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
+  if (__builtin_expect (&_IO_stdin_used != NULL, 0)
+      || (fp != _IO_stdin && fp != _IO_stdout && fp != _IO_stderr))
+    /* The object is dynamically allocated and large enough.  Initialize
+       the _mode element as well.  */
+    fp->_mode = -1;
+#endif
 }
 
 int