| Message ID | 20230814145833.1679316-1-josimmon@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v4] resolv/nss_dns/dns-host: Get rid of alloca. | expand |
On 2023-08-14 10:58, Joe Simmons-Talbott via Libc-alpha wrote: > Since the alloca is a small constant size use an array instead. > --- > Changes to v3: > * Move tmp back up one level of scope since it is used within the > enclosing scope as 'name'. > > resolv/nss_dns/dns-host.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org> > > diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c > index 1d60c51f5e..c8b77bbc35 100644 > --- a/resolv/nss_dns/dns-host.c > +++ b/resolv/nss_dns/dns-host.c > @@ -378,6 +378,7 @@ _nss_dns_gethostbyname4_r (const char *name, struct gaih_addrtuple **pat, > int *herrnop, int32_t *ttlp) > { > enum nss_status status = check_name (name, herrnop); > + char tmp[NS_MAXDNAME]; > if (status != NSS_STATUS_SUCCESS) > return status; > struct resolv_context *ctx = __resolv_context_get (); > @@ -395,8 +396,7 @@ _nss_dns_gethostbyname4_r (const char *name, struct gaih_addrtuple **pat, > */ > if (strchr (name, '.') == NULL) > { > - char *tmp = alloca (NS_MAXDNAME); > - const char *cp = __res_context_hostalias (ctx, name, tmp, NS_MAXDNAME); > + const char *cp = __res_context_hostalias (ctx, name, tmp, sizeof (tmp)); > if (cp != NULL) > name = cp; > }
diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c index 1d60c51f5e..c8b77bbc35 100644 --- a/resolv/nss_dns/dns-host.c +++ b/resolv/nss_dns/dns-host.c @@ -378,6 +378,7 @@ _nss_dns_gethostbyname4_r (const char *name, struct gaih_addrtuple **pat, int *herrnop, int32_t *ttlp) { enum nss_status status = check_name (name, herrnop); + char tmp[NS_MAXDNAME]; if (status != NSS_STATUS_SUCCESS) return status; struct resolv_context *ctx = __resolv_context_get (); @@ -395,8 +396,7 @@ _nss_dns_gethostbyname4_r (const char *name, struct gaih_addrtuple **pat, */ if (strchr (name, '.') == NULL) { - char *tmp = alloca (NS_MAXDNAME); - const char *cp = __res_context_hostalias (ctx, name, tmp, NS_MAXDNAME); + const char *cp = __res_context_hostalias (ctx, name, tmp, sizeof (tmp)); if (cp != NULL) name = cp; }
Since the alloca is a small constant size use an array instead. --- Changes to v3: * Move tmp back up one level of scope since it is used within the enclosing scope as 'name'. resolv/nss_dns/dns-host.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)