* Re: [musl] [bug] Cannot fprintf/fwprintf numbers to a wmemstream
2022-09-07 18:53 [musl] [bug] Cannot fprintf/fwprintf numbers to a wmemstream Knott, Isabelle
@ 2022-09-07 20:44 ` Rich Felker
0 siblings, 0 replies; 2+ messages in thread
From: Rich Felker @ 2022-09-07 20:44 UTC (permalink / raw)
To: Knott, Isabelle; +Cc: musl
[-- Attachment #1: Type: text/plain, Size: 2028 bytes --]
On Wed, Sep 07, 2022 at 06:53:06PM +0000, Knott, Isabelle wrote:
> [AMD Official Use Only - General]
>
> Hello, I have found that fprintf or fwprintf fails to write numbers to wmemstreams specifically, and also incorrectly reports how many characters were actually written:
>
> Here is some sample code that reproduces the issue
>
> #include <stddef.h>
> #include <stdio.h>
> #include <stdlib.h>
> #include <wchar.h>
>
> int main() {
> wchar_t* buf;
> size_t buf_size;
> FILE* fd = open_wmemstream(&buf, &buf_size);
> if(fd == 0)
> {
> return -1;
> }
> //int chars_written = fprintf(fd, "%d", 40); // this also doesn't work
> int chars_written = fwprintf(fd, L"%d", 40);
> fclose(fd);
> printf("chars_written: %d\n", chars_written);
> printf("buf_size: %ld\n", buf_size);
> fwprintf(stdout, L"expected: \"%d\"\n", 40);
> printf("actual: \"%ls\"\n", buf);
> free(buf);
> return 0;
> }
>
> with musl-gcc compiles from 1.2.3:
>
> chars_written: 2
> buf_size: 0
> expected: "40"
> actual: ""
>
> with glibc 2.35, using fprintf on the wmemstream fails, but fwprintf succeeds, though it won't write to stdout for some reason:
>
> chars_written: 2
> buf_size: 2
> actual: "40"
>
> Thanks!
> -Isabelle
Thanks! This was a really nice find. open_wmemstream intentionally
makes the stream unbuffered, and thereby doesn't even look at buffered
content in its write method, but doesn't take into account the fact
that, per commit bd57e2b43a5b56c00a82adbde0e33e5820c81164, vfprintf
installs a temporary buffer on unbuffered streams to avoid painfully
slow output on unbuffered streams where it would otherwise write a
byte or a field at a time rather than a whole "line" at once.
The attached patch analogous to what open_memstream does should fix
it. I'll commit soon after double-checking that it's right.
Thanks for the clear test case.
Rich
[-- Attachment #2: fix_wmemstream.diff --]
[-- Type: text/plain, Size: 578 bytes --]
diff --git a/src/stdio/open_wmemstream.c b/src/stdio/open_wmemstream.c
index ed1b561d..b8ae4a79 100644
--- a/src/stdio/open_wmemstream.c
+++ b/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;
^ permalink raw reply [flat|nested] 2+ messages in thread