[PATCH] inet-fortified: fix namespace violation (bug 33227)

Florian Weimer fweimer@redhat.com
Tue Jul 29 08:30:49 GMT 2025


* Sam James:

> We need to use __sz, not sz, as we do elsewhere.
> ---
> OK if testing succeeds?
>
>  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);
>  };
>
> base-commit: 03b2515065e3d700fe37741195da7c0c142d66c8

Looks good.

Reviewed-by: Florian Weimer <fweimer@redhat.com>

Thanks,
Florian



More information about the Libc-alpha mailing list