fix undefined behavior in getdelim via null pointer arithmetic and memcpy

[musl] / src / locale / wcsxfrm.c

diff --git a/src/locale/wcsxfrm.c b/src/locale/wcsxfrm.c
index f977f9e..05e3e11 100644 (file)
--- a/src/locale/wcsxfrm.c
+++ b/src/locale/wcsxfrm.c
@@ -1,21 +1,23 @@
 #include <wchar.h>
 #include <locale.h>
-#include "libc.h"
+#include "locale_impl.h"
 
 /* collate only by code points */
 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;
 }
 
 size_t wcsxfrm(wchar_t *restrict dest, const wchar_t *restrict src, size_t n)
 {
-       return __wcsxfrm_l(dest, src, n, LC_GLOBAL_LOCALE);
+       return __wcsxfrm_l(dest, src, n, CURRENT_LOCALE);
 }
 
 weak_alias(__wcsxfrm_l, wcsxfrm_l);