diff options
| author | Andreas Schwab <schwab@suse.de> | 2024-08-05 10:55:51 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2024-08-06 08:21:58 +0200 |
| commit | afc15c2044cb9449ba506fe910fa8ab77394833c (patch) | |
| tree | 0e2f2f1a7bb72e421198f3f76ace845cea28ebb9 /stdlib/bits | |
| parent | 5a5eb72d8ee4783c28fead080143d53cac993e1d (diff) | |
| download | glibc-afc15c2044cb9449ba506fe910fa8ab77394833c.tar.xz glibc-afc15c2044cb9449ba506fe910fa8ab77394833c.zip | |
Fix name space violation in fortify wrappers (bug 32052)
Rename the identifier sz to __sz everywhere.
Fixes: a643f60c53 ("Make sure that the fortified function conditionals are constant")
(cherry picked from commit 39ca997ab378990d5ac1aadbaa52aaf1db6d526f)
(redone from scratch because of many conflicts)
Diffstat (limited to 'stdlib/bits')
| -rw-r--r-- | stdlib/bits/stdlib.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/stdlib/bits/stdlib.h b/stdlib/bits/stdlib.h index 1c7191ba57..32f7ef5020 100644 --- a/stdlib/bits/stdlib.h +++ b/stdlib/bits/stdlib.h @@ -36,16 +36,16 @@ extern char *__REDIRECT_NTH (__realpath_chk_warn, __fortify_function __wur char * __NTH (realpath (const char *__restrict __name, char *__restrict __resolved)) { - size_t sz = __glibc_objsize (__resolved); + size_t __sz = __glibc_objsize (__resolved); - if (sz == (size_t) -1) + if (__sz == (size_t) -1) return __realpath_alias (__name, __resolved); #if defined _LIBC_LIMITS_H_ && defined PATH_MAX - if (__glibc_unsafe_len (PATH_MAX, sizeof (char), sz)) - return __realpath_chk_warn (__name, __resolved, sz); + if (__glibc_unsafe_len (PATH_MAX, sizeof (char), __sz)) + return __realpath_chk_warn (__name, __resolved, __sz); #endif - return __realpath_chk (__name, __resolved, sz); + return __realpath_chk (__name, __resolved, __sz); } |