about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--libio/fileops.c11
2 files changed, 14 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index eb67f1d58a..caa5a5a47a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 1999-08-18  Ulrich Drepper  <drepper@cygnus.com>
 
+	* libio/fileops.c (_IO_file_xsgetn): Allocate buffer if none is
+	allocated so far.  [PR libc/1261].
+
 	* math/libm-test.c (j0_test): Adjust deltas for m68k.
 	(jn_test): Likewise.
 
diff --git a/libio/fileops.c b/libio/fileops.c
index decb9d7185..7c6e271495 100644
--- a/libio/fileops.c
+++ b/libio/fileops.c
@@ -849,6 +849,17 @@ _IO_file_xsgetn (fp, data, n)
 
   want = n;
 
+  if (fp->_IO_buf_base == NULL)
+    {
+      /* Maybe we already have a push back pointer.  */
+      if (fp->_IO_save_base != NULL)
+	{
+	  free (fp->_IO_save_base);
+	  fp->_flags &= ~_IO_IN_BACKUP;
+	}
+      _IO_doallocbuf (fp);
+    }
+
   while (want > 0)
     {
       have = fp->_IO_read_end - fp->_IO_read_ptr;