authorgravatar for nierro92@gmail.comFederico Di Pierro <nierro92@gmail.com> 2024-08-30 14:55:24+02:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-09-01 00:34:15-07:00
logb7a98d0d590c4c71a9378a98f2984cbc04d503dd
tree1eaea89b1644645c410d495c3ad3e989d77d8e50
parenta76e98e7d517037054fdf2edcb908c129465109f

lib: guard definition of `strl{cat,cpy}` against glibc version when _FORTIFY_SOURCE is enabled.

Signed-off-by: Federico Di Pierro <nierro92@gmail.com>

1 files changed, 7 insertions(+), 1 deletions(-)

lib/libc/include/generic-glibc/bits/string_fortified.h+7-1
...@@ -150,6 +150,11 @@ __NTH (strncat (__fortify_clang_overload_arg (char *, __restrict, __dest),...@@ -150,6 +150,11 @@ __NTH (strncat (__fortify_clang_overload_arg (char *, __restrict, __dest),
150 __glibc_objsize (__dest));150 __glibc_objsize (__dest));
151}151}
152152
153/*
154 * strlcpy and strlcat introduced in glibc 2.38
155 * https://sourceware.org/git/?p=glibc.git;a=commit;h=2e0bbbfbf95fc9e22692e93658a6fbdd2d4554da
156 */
157#if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 38) || __GLIBC__ > 2
153#ifdef __USE_MISC158#ifdef __USE_MISC
154extern size_t __strlcpy_chk (char *__dest, const char *__src, size_t __n,159extern size_t __strlcpy_chk (char *__dest, const char *__src, size_t __n,
155 size_t __destlen) __THROW;160 size_t __destlen) __THROW;
...@@ -186,5 +191,6 @@ __NTH (strlcat (__fortify_clang_overload_arg (char *, __restrict, __dest),...@@ -186,5 +191,6 @@ __NTH (strlcat (__fortify_clang_overload_arg (char *, __restrict, __dest),
186 return __strlcat_alias (__dest, __src, __n);191 return __strlcat_alias (__dest, __src, __n);
187}192}
188#endif /* __USE_MISC */193#endif /* __USE_MISC */
194#endif /* glibc v2.38 and later */
189195
190#endif /* bits/string_fortified.h */
\ No newline at end of file
196#endif /* bits/string_fortified.h */