Andreas Schwab
33757a03c5
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=755
41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
From bc13db73937730401d592b33092db6df806d193e Mon Sep 17 00:00:00 2001
|
|
From: Sam James <sam@gentoo.org>
|
|
Date: Mon, 28 Jul 2025 21:55:30 +0100
|
|
Subject: [PATCH] inet-fortified: fix namespace violation (bug 33227)
|
|
|
|
We need to use __sz, not sz, as we do elsewhere.
|
|
|
|
Reviewed-by: Florian Weimer <fweimer@redhat.com>
|
|
(cherry picked from commit 87afbd7a1ad9c1dd116921817fa97198171045db)
|
|
---
|
|
inet/bits/inet-fortified.h | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/inet/bits/inet-fortified.h b/inet/bits/inet-fortified.h
|
|
index 6738221a54..cc476ebcfd 100644
|
|
--- a/inet/bits/inet-fortified.h
|
|
+++ b/inet/bits/inet-fortified.h
|
|
@@ -45,15 +45,15 @@ __NTH (inet_pton (int __af,
|
|
__fortify_clang_warning_only_if_bos0_lt
|
|
(4, __dst, "inet_pton called with destination buffer size less than 4")
|
|
{
|
|
- size_t sz = 0;
|
|
+ size_t __sz = 0;
|
|
if (__af == AF_INET)
|
|
- sz = sizeof (struct in_addr);
|
|
+ __sz = sizeof (struct in_addr);
|
|
else if (__af == AF_INET6)
|
|
- sz = sizeof (struct in6_addr);
|
|
+ __sz = sizeof (struct in6_addr);
|
|
else
|
|
return __inet_pton_alias (__af, __src, __dst);
|
|
|
|
- return __glibc_fortify (inet_pton, sz, sizeof (char),
|
|
+ return __glibc_fortify (inet_pton, __sz, sizeof (char),
|
|
__glibc_objsize (__dst),
|
|
__af, __src, __dst);
|
|
};
|
|
--
|
|
2.51.0
|
|
|