Browse Source

fix fwprintf missing output to open_wmemstream FILEs

open_wmemstream's write method was written assuming no buffering,
since it sets the FILE up with buf_len of zero in order to avoid
issues with position/seeking. however, as a consequence of commit
bd57e2b43a, a FILE being written to by
the printf core has a temporary local buffer for the duration of the
operation if it was unbuffered to begin with. since this was
disregarded by the wide memstream's write method, output produced
through this code path, particularly numeric fields, was missing from
the output wchar buffer.

copy the equivalent logic for using the buffered data from the
byte-oriented open_memstream.
master
Rich Felker 4 years ago
parent
commit
25085c85a0
  1. 6
      src/stdio/open_wmemstream.c

6
src/stdio/open_wmemstream.c

@ -40,8 +40,12 @@ fail:
static size_t wms_write(FILE *f, const unsigned char *buf, size_t len)
{
struct cookie *c = f->cookie;
size_t len2;
size_t len2 = f->wpos - f->wbase;
wchar_t *newbuf;
if (len2) {
f->wpos = f->wbase;
if (wms_write(f, f->wbase, len2) < len2) return 0;
}
if (len + c->pos >= c->space) {
len2 = 2*c->space+1 | c->pos+len+1;
if (len2 > SSIZE_MAX/4) return 0;

Loading…
Cancel
Save