diff options
Diffstat (limited to 'src/stdio/vfwprintf.c')
| -rw-r--r-- | src/stdio/vfwprintf.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/stdio/vfwprintf.c b/src/stdio/vfwprintf.c index c6400591..ebdff001 100644 --- a/src/stdio/vfwprintf.c +++ b/src/stdio/vfwprintf.c @@ -149,7 +149,7 @@ static void pop_arg(union arg *arg, int type, va_list *ap) static void out(FILE *f, const wchar_t *s, size_t l) { - while (l--) fputwc(*s++, f); + while (l-- && !(f->flags & F_ERR)) fputwc(*s++, f); } static int getint(wchar_t **s) { @@ -345,6 +345,7 @@ int vfwprintf(FILE *restrict f, const wchar_t *restrict fmt, va_list ap) va_list ap2; int nl_type[NL_ARGMAX] = {0}; union arg nl_arg[NL_ARGMAX]; + int olderr; int ret; /* the copy allows passing va_list* even if va_list is an array */ @@ -356,7 +357,11 @@ int vfwprintf(FILE *restrict f, const wchar_t *restrict fmt, va_list ap) FLOCK(f); f->mode |= f->mode+1; + olderr = f->flags & F_ERR; + f->flags &= ~F_ERR; ret = wprintf_core(f, fmt, &ap2, nl_arg, nl_type); + if (f->flags & F_ERR) ret = -1; + f->flags |= olderr; FUNLOCK(f); va_end(ap2); return ret; |