public inbox for libc-alpha@sourceware.org
 help / color / mirror / Atom feed
From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org
Subject: Re: [PATCH v2 2/3] inet: Remove strdupa from nrl_domainname()
Date: Thu, 3 Feb 2022 17:52:57 -0300	[thread overview]
Message-ID: <c73f0ef7-d893-c6a5-dfc6-916002f94ea5@linaro.org> (raw)
In-Reply-To: <20211210110733.1499984-3-adhemerval.zanella@linaro.org>

Ping.

On 10/12/2021 08:07, Adhemerval Zanella wrote:
> We can use the already in place scratch_buffer.
> 
> Checked on x86_64-linux-gnu.
> ---
>  inet/getnameinfo.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/inet/getnameinfo.c b/inet/getnameinfo.c
> index 5eee354200..2d2397e7dc 100644
> --- a/inet/getnameinfo.c
> +++ b/inet/getnameinfo.c
> @@ -118,15 +118,15 @@ nrl_domainname_core (struct scratch_buffer *tmpbuf)
>        else
>  	{
>  	  /* We need to preserve the hostname.  */
> -	  const char *hstname = strdupa (tmpbuf->data);
> -	  while (__gethostbyname_r (hstname, &th,
> -				    tmpbuf->data,
> -				    tmpbuf->length,
> +	  size_t hstnamelen = strlen (tmpbuf->data) + 1;
> +	  while (__gethostbyname_r (tmpbuf->data, &th,
> +				    tmpbuf->data + hstnamelen,
> +				    tmpbuf->length - hstnamelen,
>  				    &h, &herror))
>  	    {
>  	      if (herror == NETDB_INTERNAL && errno == ERANGE)
>  		{
> -		  if (!scratch_buffer_grow (tmpbuf))
> +		  if (!scratch_buffer_grow_preserve (tmpbuf))
>  		    return;
>  		}
>  	      else

  reply	other threads:[~2022-02-03 20:53 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-10 11:07 [PATCH v2 0/3] Fixes for getnameinfo() with NI_NOFQDN Adhemerval Zanella
2021-12-10 11:07 ` [PATCH v2 1/3] inet: Fix getnameinfo (NI_NOFQDN) race condition (BZ#28566) Adhemerval Zanella
2022-02-03 20:52   ` Adhemerval Zanella
2022-03-08  3:44   ` DJ Delorie
2021-12-10 11:07 ` [PATCH v2 2/3] inet: Remove strdupa from nrl_domainname() Adhemerval Zanella
2022-02-03 20:52   ` Adhemerval Zanella [this message]
2022-03-08  3:53   ` DJ Delorie
2021-12-10 11:07 ` [PATCH v2 3/3] inet: Return EAI_MEMORY when nrl_domainname() fails to allocate memory Adhemerval Zanella
2022-02-03 20:53   ` Adhemerval Zanella
2022-03-08  4:12   ` DJ Delorie
2022-03-08 15:43     ` Adhemerval Zanella
  -- strict thread matches above, loose matches on Subject: below --
2021-11-12 14:21 [PATCH v2 0/3] Fixes for getnameinfo() with NI_NOFQDN Adhemerval Zanella
2021-11-12 14:21 ` [PATCH v2 2/3] inet: Remove strdupa from nrl_domainname() Adhemerval Zanella

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=c73f0ef7-d893-c6a5-dfc6-916002f94ea5@linaro.org \
    --to=adhemerval.zanella@linaro.org \
    --cc=libc-alpha@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).