about summary refs log tree commit diff
path: root/stdlib
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@suse.de>2024-08-05 10:55:51 +0200
committerAndreas Schwab <schwab@suse.de>2024-08-05 16:49:58 +0200
commit39ca997ab378990d5ac1aadbaa52aaf1db6d526f (patch)
tree09d025937fc8aa6345cfa0041c059cda9718579a /stdlib
parent1b0a2062c8938c7333cd118d85d9976c4e7c92af (diff)
downloadglibc-39ca997ab378990d5ac1aadbaa52aaf1db6d526f.tar.gz
glibc-39ca997ab378990d5ac1aadbaa52aaf1db6d526f.tar.xz
glibc-39ca997ab378990d5ac1aadbaa52aaf1db6d526f.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")
Diffstat (limited to 'stdlib')
-rw-r--r--stdlib/bits/stdlib.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/stdlib/bits/stdlib.h b/stdlib/bits/stdlib.h
index 1557b862b1..9c78ecf458 100644
--- a/stdlib/bits/stdlib.h
+++ b/stdlib/bits/stdlib.h
@@ -43,16 +43,16 @@ __NTH (realpath (const char *__restrict __name,
 					     "bytes long buffer")
 #endif
 {
-  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 !__fortify_use_clang && 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);
 }