From 11ddc314b57196519316103b02acffe10299dad3 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Thu, 31 Aug 2017 14:30:28 -0400 Subject: fix erroneous stop before input limit in mbsnrtowcs and wcsnrtombs the value computed as an output limit that bounds the amount of input consumed below the input limit was incorrectly being used as the actual amount of input consumed. instead, compute the actual amount of input consumed as a difference of pointers before and after the conversion. patch by Mikhail Kremnyov. --- src/multibyte/wcsnrtombs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/multibyte/wcsnrtombs.c') diff --git a/src/multibyte/wcsnrtombs.c b/src/multibyte/wcsnrtombs.c index 640cbbeb..676932b5 100644 --- a/src/multibyte/wcsnrtombs.c +++ b/src/multibyte/wcsnrtombs.c @@ -5,13 +5,14 @@ size_t wcsnrtombs(char *restrict dst, const wchar_t **restrict wcs, size_t wn, s size_t l, cnt=0, n2; char *s, buf[256]; const wchar_t *ws = *wcs; + const wchar_t *tmp_ws; if (!dst) s = buf, n = sizeof buf; else s = dst; while ( ws && n && ( (n2=wn)>=n || n2>32 ) ) { if (n2>=n) n2=n; - wn -= n2; + tmp_ws = ws; l = wcsrtombs(s, &ws, n2, 0); if (!(l+1)) { cnt = l; @@ -22,6 +23,7 @@ size_t wcsnrtombs(char *restrict dst, const wchar_t **restrict wcs, size_t wn, s s += l; n -= l; } + wn = ws ? wn - (ws - tmp_ws) : 0; cnt += l; } if (ws) while (n && wn) { -- cgit v1.2.1