X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fstdio%2Fvswprintf.c;h=f3d4fec1903682ccf0413871cbcf2f6f609b2224;hp=2d9f2002bec26ac34db0b0e21a97c52ad7c009cf;hb=f1b23d41cff432a8d0939af427fa005b4a4f95d7;hpb=9ae8d5fc71a4b61ec826d58f03f7b543755fb1d4

diff --git a/src/stdio/vswprintf.c b/src/stdio/vswprintf.c
index 2d9f2002..f3d4fec1 100644
--- a/src/stdio/vswprintf.c
+++ b/src/stdio/vswprintf.c
@@ -10,6 +10,8 @@ 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;
+	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;
@@ -20,7 +22,7 @@ static size_t sw_write(FILE *f, const unsigned char *s, size_t l)
 	return i<0 ? i : l0;
 }
 
-int vswprintf(wchar_t *s, size_t n, const wchar_t *fmt, va_list ap)
+int vswprintf(wchar_t *restrict s, size_t n, const wchar_t *restrict fmt, va_list ap)
 {
 	int r;
 	FILE f;
@@ -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;
 }