[compiler-rt] [sanitizer_common] Add internal_wcs[n]cpy functions (PR #66529)
nicole mazzuca via llvm-commits
llvm-commits at lists.llvm.org
Fri Sep 15 09:48:50 PDT 2023
https://github.com/strega-nil created https://github.com/llvm/llvm-project/pull/66529
These functions are required for the related wcs[n]cpy functions to be wrapped on Windows, since given our current method of wrapping functions, calling REAL(wcs[n]cpy) is broken.
@vitalybuka requested that these changes be split out from llvm/llvm-project#66128.
>From d15f31d89b467589213787bd61e0b5617ce83fee Mon Sep 17 00:00:00 2001
From: Nicole Mazzuca <nicole at strega-nil.co>
Date: Fri, 15 Sep 2023 09:35:46 -0700
Subject: [PATCH] [sanitizer_common] Add internal_wcs[n]cpy functions
These functions are required for the related wcs[n]cpy functions to be
wrapped on Windows, since given our current method of wrapping
functions, calling REAL(wcs[n]cpy) is broken.
@vitalybuka requested that these changes be split out from
llvm/llvm-project#66128.
---
.../lib/sanitizer_common/sanitizer_libc.cpp | 16 ++++++++++++++++
.../lib/sanitizer_common/sanitizer_libc.h | 3 ++-
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_libc.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_libc.cpp
index 4a6fa5e8dbacb49..bb4592aa14c7c44 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_libc.cpp
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_libc.cpp
@@ -199,6 +199,14 @@ char *internal_strncat(char *dst, const char *src, uptr n) {
return dst;
}
+wchar_t *internal_wcscpy(wchar_t *dst, const wchar_t *src) {
+ wchar_t *dst_it = dst;
+ do {
+ *dst_it++ = *src++;
+ } while (*src);
+ return dst;
+}
+
uptr internal_strlcpy(char *dst, const char *src, uptr maxlen) {
const uptr srclen = internal_strlen(src);
if (srclen < maxlen) {
@@ -217,6 +225,14 @@ char *internal_strncpy(char *dst, const char *src, uptr n) {
internal_memset(dst + i, '\0', n - i);
return dst;
}
+wchar_t *internal_wcsncpy(wchar_t *dst, const wchar_t *src, uptr n) {
+ uptr i;
+ for (i = 0; i < n && src[i]; ++i) {
+ dst[i] = src[i];
+ }
+ internal_memset(dst + i, 0, (n - i) * sizeof(wchar_t));
+ return dst;
+}
uptr internal_strnlen(const char *s, uptr maxlen) {
uptr i = 0;
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_libc.h b/compiler-rt/lib/sanitizer_common/sanitizer_libc.h
index e881db2079086d4..1906569e2a5fc55 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_libc.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_libc.h
@@ -71,7 +71,8 @@ int internal_snprintf(char *buffer, uptr length, const char *format, ...)
FORMAT(3, 4);
uptr internal_wcslen(const wchar_t *s);
uptr internal_wcsnlen(const wchar_t *s, uptr maxlen);
-
+wchar_t *internal_wcscpy(wchar_t *dst, const wchar_t *src);
+wchar_t *internal_wcsncpy(wchar_t *dst, const wchar_t *src, uptr maxlen);
// Return true if all bytes in [mem, mem+size) are zero.
// Optimized for the case when the result is true.
bool mem_is_zero(const char *mem, uptr size);
More information about the llvm-commits
mailing list