libio: Check remaining buffer size in _IO_wdo_write (bug 31183)

The multibyte character needs to fit into the remaining buffer space,
not the already-written buffer space.  Without the fix, we were never
moving the write pointer from the start of the buffer, always using
the single-character fallback buffer.

Fixes commit 04b76b5aa8 ("Don't error out writing
a multibyte character to an unbuffered stream (bug 17522)").
This commit is contained in:
Florian Weimer 2024-01-02 14:36:17 +01:00
parent 5eabdb6a6a
commit ecc7c3deb9

View File

@ -55,7 +55,7 @@ _IO_wdo_write (FILE *fp, const wchar_t *data, size_t to_do)
char mb_buf[MB_LEN_MAX]; char mb_buf[MB_LEN_MAX];
char *write_base, *write_ptr, *buf_end; char *write_base, *write_ptr, *buf_end;
if (fp->_IO_write_ptr - fp->_IO_write_base < sizeof (mb_buf)) if (fp->_IO_buf_end - fp->_IO_write_ptr < sizeof (mb_buf))
{ {
/* Make sure we have room for at least one multibyte /* Make sure we have room for at least one multibyte
character. */ character. */