cherry-pick musl 1.1.3 wcsxfrm.c, fixes #2473

kripken · kripken · commit e70413657a51 · 2014-07-02T15:29:03.000-07:00
diff --git a/system/lib/libc/musl/src/locale/wcsxfrm.c b/system/lib/libc/musl/src/locale/wcsxfrm.c
@@ -6,10 +6,12 @@
 size_t __wcsxfrm_l(wchar_t *restrict dest, const wchar_t *restrict src, size_t n, locale_t loc)
 {
 	size_t l = wcslen(src);
-	if (l >= n) {
+	if (l < n) {
+		wmemcpy(dest, src, l+1);
+	} else if (n) {
 		wmemcpy(dest, src, n-1);
 		dest[n-1] = 0;
-	} else wcscpy(dest, src);
+	}
 	return l;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,12 @@`
`6`	`6`	`size_t __wcsxfrm_l(wchar_t restrict dest, const wchar_t restrict src, size_t n, locale_t loc)`
`7`	`7`	`{`
`8`	`8`	`size_t l = wcslen(src);`
`9`		`- if (l >= n) {`
	`9`	`+ if (l < n) {`
	`10`	`+ wmemcpy(dest, src, l+1);`
	`11`	`+ } else if (n) {`
`10`	`12`	`wmemcpy(dest, src, n-1);`
`11`	`13`	`dest[n-1] = 0;`
`12`		`- } else wcscpy(dest, src);`
	`14`	`+ }`
`13`	`15`	`return l;`
`14`	`16`	`}`
`15`	`17`