From 536c6d5a4205e2a3f161f2983ce1e0ac3082187d Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Sat, 13 Jun 2015 05:17:16 +0000 Subject: fix idiom for setting stdio stream orientation to wide the old idiom, f->mode |= f->mode+1, was adapted from the idiom for setting byte orientation, f->mode |= f->mode-1, but the adaptation was incorrect. unless the stream was alreasdy set byte-oriented, this code incremented f->mode each time it was executed, which would eventually lead to overflow. it could be fixed by changing it to f->mode |= 1, but upcoming changes will require slightly more work at the time of wide orientation, so it makes sense to just call fwide. as an optimization in the single-character functions, fwide is only called if the stream is not already wide-oriented. --- src/stdio/fputws.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/stdio/fputws.c') diff --git a/src/stdio/fputws.c b/src/stdio/fputws.c index 5723cbcd..317d65f1 100644 --- a/src/stdio/fputws.c +++ b/src/stdio/fputws.c @@ -8,7 +8,7 @@ int fputws(const wchar_t *restrict ws, FILE *restrict f) FLOCK(f); - f->mode |= f->mode+1; + fwide(f, 1); while (ws && (l = wcsrtombs((void *)buf, (void*)&ws, sizeof buf, 0))+1 > 1) if (__fwritex(buf, l, f) < l) { -- cgit v1.2.1