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/fgetwc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/stdio/fgetwc.c') diff --git a/src/stdio/fgetwc.c b/src/stdio/fgetwc.c index 8626d54c..b261b44f 100644 --- a/src/stdio/fgetwc.c +++ b/src/stdio/fgetwc.c @@ -10,7 +10,7 @@ wint_t __fgetwc_unlocked(FILE *f) unsigned char b; size_t l; - f->mode |= f->mode+1; + if (f->mode <= 0) fwide(f, 1); /* Convert character from buffer if possible */ if (f->rpos < f->rend) { -- cgit v1.2.1