diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2008-07-15 18:13:22 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2008-07-15 18:13:22 +0000 |
| commit | 2486b4965bc9cad848f2da57fe0ea53f851bd5ad (patch) | |
| tree | 4eeaf097876dcbf742053202001e6212ec4d90d9 | |
| parent | 9667f97dd3c6daabfabf43c24601ff6f941902c2 (diff) | |
| download | glibc-2486b4965bc9cad848f2da57fe0ea53f851bd5ad.tar.gz glibc-2486b4965bc9cad848f2da57fe0ea53f851bd5ad.tar.xz glibc-2486b4965bc9cad848f2da57fe0ea53f851bd5ad.zip | |
* stdio-common/vfprintf.c (_IO_helper_overflow): In case _IO_sputn cvs/fedora-glibc-20080716T0944
doesn't manage to write anything, fail.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | stdio-common/vfprintf.c | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 45c79fdedb..15b1c5284f 100644 --- 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 index ca6343c37f..78a1c77d8a 100644 --- 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,6 +2080,8 @@ _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 @@ -2087,6 +2089,8 @@ _IO_helper_overflow (_IO_FILE *s, int c) 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 |