4 files changed, 86 insertions, 0 deletions
diff --git a/lib/sanitizer_common/sanitizer_common_interceptors.inc b/lib/sanitizer_common/sanitizer_common_interceptors.inc
index eddc54e6f..6df0971e0 100644
--- a/lib/sanitizer_common/sanitizer_common_interceptors.inc
+++ b/lib/sanitizer_common/sanitizer_common_interceptors.inc
@@ -6529,6 +6529,41 @@ INTERCEPTOR(wchar_t *, wcsncat, wchar_t *dst, const wchar_t *src, SIZE_T n) {
 #define INIT_WCSCAT
 #endif
 
+#if SANITIZER_INTERCEPT_WCSXFRM
+INTERCEPTOR(SIZE_T, wcsxfrm, wchar_t *dest, const wchar_t *src, SIZE_T len) {
+  void *ctx;
+  COMMON_INTERCEPTOR_ENTER(ctx, wcsxfrm, dest, src, len);
+  COMMON_INTERCEPTOR_READ_RANGE(ctx, src,
+                                sizeof(wchar_t) * (REAL(wcslen)(src) + 1));
+
+  SIZE_T res = REAL(wcsxfrm)(dest, src, len);
+  if (res < len)
+    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, dest, sizeof(wchar_t) * (res + 1));
+
+  return res;
+}
+
+INTERCEPTOR(SIZE_T, wcsxfrm_l, wchar_t *dest, const wchar_t *src, SIZE_T len,
+            void *locale) {
+  void *ctx;
+  COMMON_INTERCEPTOR_ENTER(ctx, wcsxfrm_l, dest, src, len, locale);
+  COMMON_INTERCEPTOR_READ_RANGE(ctx, src,
+                                sizeof(wchar_t) * (REAL(wcslen)(src) + 1));
+
+  SIZE_T res = REAL(wcsxfrm_l)(dest, src, len, locale);
+  if (res < len)
+    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, dest, sizeof(wchar_t) * (res + 1));
+
+  return res;
+}
+
+#define INIT_WCSXFRM                  \
+  COMMON_INTERCEPT_FUNCTION(wcsxfrm); \
+  COMMON_INTERCEPT_FUNCTION(wcsxfrm_l);
+#else
+#define INIT_WCSXFRM
+#endif
+
 #if SANITIZER_INTERCEPT_ACCT
 INTERCEPTOR(int, acct, const char *file) {
   void *ctx;
@@ -7275,6 +7310,7 @@ static void InitializeCommonInterceptors() {
   INIT_GETLOADAVG;
   INIT_WCSLEN;
   INIT_WCSCAT;
+  INIT_WCSXFRM;
   INIT_ACCT;
   INIT_USER_FROM_UID;
   INIT_UID_FROM_USER;
diff --git a/lib/sanitizer_common/sanitizer_platform_interceptors.h b/lib/sanitizer_common/sanitizer_platform_interceptors.h
index 2147766d9..fd3cedcc1 100644
--- a/lib/sanitizer_common/sanitizer_platform_interceptors.h
+++ b/lib/sanitizer_common/sanitizer_platform_interceptors.h
@@ -246,6 +246,7 @@
 #define SANITIZER_INTERCEPT_MBSNRTOWCS \
   (SI_MAC || SI_LINUX_NOT_ANDROID || SI_SOLARIS)
 #define SANITIZER_INTERCEPT_WCSTOMBS SI_POSIX
+#define SANITIZER_INTERCEPT_WCSXFRM SI_POSIX
 #define SANITIZER_INTERCEPT_WCSNRTOMBS \
   (SI_FREEBSD || SI_NETBSD || SI_MAC || SI_LINUX_NOT_ANDROID || SI_SOLARIS)
 #define SANITIZER_INTERCEPT_WCRTOMB \
diff --git a/test/msan/wcsxfrm.cc b/test/msan/wcsxfrm.cc
new file mode 100644
index 000000000..f13c5d396
--- /dev/null
+++ b/test/msan/wcsxfrm.cc
@@ -0,0 +1,30 @@
+// RUN: %clangxx_msan -O0 -g %s -o %t && not %run %t
+
+#include <assert.h>
+#include <locale.h>
+#include <sanitizer/msan_interface.h>
+#include <stdlib.h>
+#include <wchar.h>
+
+int main(void) {
+  wchar_t q[10];
+  size_t n = wcsxfrm(q, L"abcdef", sizeof(q) / sizeof(wchar_t));
+  assert(n < sizeof(q));
+  __msan_check_mem_is_initialized(q, (n + 1) * sizeof(wchar_t));
+
+  locale_t loc = newlocale(LC_ALL_MASK, "", (locale_t)0);
+
+  __msan_poison(&q, sizeof(q));
+  n = wcsxfrm_l(q, L"qwerty", sizeof(q) / sizeof(wchar_t), loc);
+  assert(n < sizeof(q));
+  __msan_check_mem_is_initialized(q, (n + 1) * sizeof(wchar_t));
+
+  q[0] = 'A';
+  q[1] = '\x00';
+  __msan_poison(&q, sizeof(q));
+  wcsxfrm(NULL, q, 0);
+
+  // CHECK: WARNING: MemorySanitizer: use-of-uninitialized-value
+  // CHECK:    in main {{.*}}wcsxfrm.cc:25
+  return 0;
+}
diff --git a/test/sanitizer_common/TestCases/Posix/wcsxfrm.c b/test/sanitizer_common/TestCases/Posix/wcsxfrm.c
new file mode 100644
index 000000000..10c6aa224
--- /dev/null
+++ b/test/sanitizer_common/TestCases/Posix/wcsxfrm.c
@@ -0,0 +1,19 @@
+// RUN: %clang -O0 %s -o %t && %run %t
+
+#include <assert.h>
+#include <locale.h>
+#include <wchar.h>
+
+int main(int argc, char **argv) {
+  wchar_t q[10];
+  size_t n = wcsxfrm(q, L"abcdef", sizeof(q) / sizeof(wchar_t));
+  assert(n < sizeof(q));
+
+  wchar_t q2[10];
+  locale_t loc = newlocale(LC_ALL_MASK, "", (locale_t)0);
+  n = wcsxfrm_l(q2, L"qwerty", sizeof(q) / sizeof(wchar_t), loc);
+  assert(n < sizeof(q2));
+
+  freelocale(loc);
+  return 0;
+}