X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fstdio%2Fvswprintf.c;h=8e8f80ce9cf5a18dd9e282e4ece80d307590ecef;hb=aed707f679cce80afd929f0efaf080f1e8481330;hp=4ad581fb4c400d592b6a980791c9ad1b26d397f4;hpb=e18b56382154fe1c5803f6b9ee36e2991174c037;p=musl

diff --git a/src/stdio/vswprintf.c b/src/stdio/vswprintf.c
index 4ad581fb..8e8f80ce 100644
--- a/src/stdio/vswprintf.c
+++ b/src/stdio/vswprintf.c
@@ -10,7 +10,9 @@ static size_t sw_write(FILE *f, const unsigned char *s, size_t l)
 	size_t l0 = l;
 	int i = 0;
 	struct cookie *c = f->cookie;
-	while (c->l && l && (i=mbtowc(c->ws, s, l))>=0) {
+	if (s!=f->wbase && sw_write(f, f->wbase, f->wpos-f->wbase)==-1)
+		return -1;
+	while (c->l && l && (i=mbtowc(c->ws, (void *)s, l))>=0) {
 		s+=i;
 		l-=i;
 		c->l--;
@@ -32,7 +34,7 @@ int vswprintf(wchar_t *s, size_t n, const wchar_t *fmt, va_list ap)
 	f.write = sw_write;
 	f.buf_size = sizeof buf;
 	f.buf = buf;
-	f.owner = -1;
+	f.lock = -1;
 	f.cookie = &c;
 	if (!n) {
 		return -1;
@@ -41,6 +43,6 @@ int vswprintf(wchar_t *s, size_t n, const wchar_t *fmt, va_list ap)
 		return -1;
 	}
 	r = vfwprintf(&f, fmt, ap);
-	__oflow(&f);
+	sw_write(&f, 0, 0);
 	return r>=n ? -1 : r;
 }