diff options
| author | Ron Lieberman <ron.lieberman@amd.com> | 2023-02-06 13:16:37 -0600 |
|---|---|---|
| committer | Ron Lieberman <ron.lieberman@amd.com> | 2023-02-06 13:16:37 -0600 |
| commit | c55d6f169b8b804122e1433c0298a739bfd0c777 (patch) | |
| tree | f57a1be997ae2502c4be0c77aa489d268e446894 /openmp/runtime | |
| parent | 630266aed342797d6413a69b8792567fc6263501 (diff) | |
| download | llvm-c55d6f169b8b804122e1433c0298a739bfd0c777.tar.gz | |
Revert "[OpenMP][libomp] Remove false positive for memory sanitizer"
breaks amdgpu buildbot
This reverts commit 402981ee25fe135d63226a7de17dbb14c437c71b.
Diffstat (limited to 'openmp/runtime')
| -rw-r--r-- | openmp/runtime/src/kmp_safe_c_api.h | 2 | ||||
| -rw-r--r-- | openmp/runtime/src/kmp_str.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/openmp/runtime/src/kmp_safe_c_api.h b/openmp/runtime/src/kmp_safe_c_api.h index 72f26fd9897d..3db1ada37b07 100644 --- a/openmp/runtime/src/kmp_safe_c_api.h +++ b/openmp/runtime/src/kmp_safe_c_api.h @@ -30,7 +30,6 @@ #define KMP_SSCANF sscanf_s #define KMP_STRCPY_S strcpy_s #define KMP_STRNCPY_S strncpy_s -#define KMP_STRNCAT_S strncat_s // Use this only when buffer size is unknown #define KMP_MEMCPY(dst, src, cnt) memcpy_s(dst, cnt, src, cnt) @@ -62,7 +61,6 @@ template <typename T> struct kmp_get_rmax_t<T, true> { #define KMP_SSCANF sscanf #define KMP_STRCPY_S(dst, bsz, src) strcpy(dst, src) #define KMP_STRNCPY_S(dst, bsz, src, cnt) strncpy(dst, src, cnt) -#define KMP_STRNCAT_S(dst, bsz, src, cnt) strncat(dst, src, cnt) #define KMP_VSNPRINTF vsnprintf #define KMP_STRNCPY strncpy #define KMP_STRLEN strlen diff --git a/openmp/runtime/src/kmp_str.cpp b/openmp/runtime/src/kmp_str.cpp index 41e4148cfe3c..e64f989fbc69 100644 --- a/openmp/runtime/src/kmp_str.cpp +++ b/openmp/runtime/src/kmp_str.cpp @@ -137,7 +137,8 @@ void __kmp_str_buf_cat(kmp_str_buf_t *buffer, char const *str, size_t len) { KMP_DEBUG_ASSERT(len >= 0); __kmp_str_buf_reserve(buffer, buffer->used + len + 1); - KMP_STRNCAT_S(buffer->str + buffer->used, len + 1, str, len); + KMP_MEMCPY(buffer->str + buffer->used, str, len); + buffer->str[buffer->used + len] = 0; __kmp_type_convert(buffer->used + len, &(buffer->used)); KMP_STR_BUF_INVARIANT(buffer); } // __kmp_str_buf_cat @@ -150,7 +151,8 @@ void __kmp_str_buf_catbuf(kmp_str_buf_t *dest, const kmp_str_buf_t *src) { if (!src->str || !src->used) return; __kmp_str_buf_reserve(dest, dest->used + src->used + 1); - KMP_STRNCAT_S(dest->str + dest->used, src->used + 1, src->str, src->used); + KMP_MEMCPY(dest->str + dest->used, src->str, src->used); + dest->str[dest->used + src->used] = 0; dest->used += src->used; KMP_STR_BUF_INVARIANT(dest); } // __kmp_str_buf_catbuf |