X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fstdlib%2Fwcstol.c;h=840bb0a6d8209163595b2e7db1cea813de3b31ba;hp=822bcf1a243795521a26a9a378746af0889ab0f7;hb=6255c4c6a5599724d18311a7776aebe67f8e6d4a;hpb=a4310aa2f592779118912fe5e7f6df4fd6b6d64a

diff --git a/src/stdlib/wcstol.c b/src/stdlib/wcstol.c
index 822bcf1a..840bb0a6 100644
--- a/src/stdlib/wcstol.c
+++ b/src/stdlib/wcstol.c
@@ -27,6 +27,7 @@ static size_t do_read(FILE *f, unsigned char *buf, size_t len)
 
 static unsigned long long wcstox(const wchar_t *s, wchar_t **p, int base, unsigned long long lim)
 {
+	wchar_t *t = (wchar_t *)s;
 	unsigned char buf[64];
 	FILE f = {0};
 	f.flags = 0;
@@ -35,12 +36,13 @@ static unsigned long long wcstox(const wchar_t *s, wchar_t **p, int base, unsign
 	f.buf_size = sizeof buf - 4;
 	f.lock = -1;
 	f.read = do_read;
-	f.cookie = (void *)s;
+	while (iswspace(*t)) t++;
+	f.cookie = (void *)t;
 	shlim(&f, 0);
 	unsigned long long y = __intscan(&f, base, 1, lim);
 	if (p) {
 		size_t cnt = shcnt(&f);
-		*p = (wchar_t *)s + cnt;
+		*p = cnt ? t + cnt : (wchar_t *)s;
 	}
 	return y;
 }