From: Szabolcs Nagy <nsz@port70.net>
To: musl@lists.openwall.com
Subject: [PATCH] fix fgetwc when decoding a character that crosses buffer boundary
Date: Sat, 18 Nov 2017 17:51:48 +0100 [thread overview]
Message-ID: <20171118165148.GF15263@port70.net> (raw)
Update the buffer position according to the bytes consumed into st when
decoding an incomplete character at the end of the buffer.
---
src/stdio/fgetwc.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/stdio/fgetwc.c b/src/stdio/fgetwc.c
index e455cfec..a00c1a86 100644
--- a/src/stdio/fgetwc.c
+++ b/src/stdio/fgetwc.c
@@ -15,20 +15,21 @@ static wint_t __fgetwc_unlocked_internal(FILE *f)
if (f->rpos < f->rend) {
l = mbrtowc(&wc, (void *)f->rpos, f->rend - f->rpos, &st);
if (l+2 >= 2) {
f->rpos += l + !l; /* l==0 means 1 byte, null */
return wc;
}
if (l == -1) {
f->rpos++;
return WEOF;
}
+ f->rpos = f->rend;
} else l = -2;
/* Convert character byte-by-byte */
while (l == -2) {
b = c = getc_unlocked(f);
if (c < 0) {
if (!mbsinit(&st)) errno = EILSEQ;
return WEOF;
}
l = mbrtowc(&wc, (void *)&b, 1, &st);
--
2.15.0
next reply other threads:[~2017-11-18 16:51 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-18 16:51 Szabolcs Nagy [this message]
2017-11-19 1:12 ` Rich Felker
2017-11-19 1:14 ` Rich Felker
2017-11-20 1:48 ` Further wide stdio issues [Was: Re: [PATCH] fix fgetwc when decoding a character that crosses buffer boundary] Rich Felker
2017-11-20 19:28 ` Rich Felker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171118165148.GF15263@port70.net \
--to=nsz@port70.net \
--cc=musl@lists.openwall.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/musl/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).