* stdio-common/vfprintf.c (_IO_helper_overflow): In case _IO_sputn

doesn't manage to write anything, fail.
git-mirror · Jul 15, 2008 · 2486b49 · 2486b49
1 parent 9667f97
commit 2486b49
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,8 @@
 2008-07-15  Ulrich Drepper  <drepper@redhat.com>
 
+	* stdio-common/vfprintf.c (_IO_helper_overflow): In case _IO_sputn
+	doesn't manage to write anything, fail.
+
 	* malloc/hooks.c (__malloc_check_init): Remove printf.
 
 2008-07-14  Samuel Thibault  <samuel.thibault@ens-lyon.org>

diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2002, 2003, 2004, 2005, 2006, 2007
+/* Copyright (C) 1991-2002, 2003, 2004, 2005, 2006, 2007, 2008
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -2080,13 +2080,17 @@ _IO_helper_overflow (_IO_FILE *s, int c)
     {
       _IO_size_t written = _IO_sputn (target, s->_wide_data->_IO_write_base,
 				      used);
+      if (written == 0)
+	return WEOF;
       s->_wide_data->_IO_write_ptr -= written;
     }
 #else
   int used = s->_IO_write_ptr - s->_IO_write_base;
   if (used)
     {
       _IO_size_t written = _IO_sputn (target, s->_IO_write_base, used);
+      if (written == 0)
+	return EOF;
       s->_IO_write_ptr -= written;
     }
 #endif