public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] getaddrinfo: Get rid of alloca
@ 2023-09-06 13:33 Joe Simmons-Talbott
0 siblings, 0 replies; only message in thread
From: Joe Simmons-Talbott @ 2023-09-06 13:33 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=955a47a4bf517ac17d24829547bafd2a79e584e1
commit 955a47a4bf517ac17d24829547bafd2a79e584e1
Author: Joe Simmons-Talbott <josimmon@redhat.com>
Date: Wed Sep 6 13:32:46 2023 +0000
getaddrinfo: Get rid of alloca
Use a scratch_buffer rather than alloca to avoid potential stack
overflow.
Diff:
---
sysdeps/posix/getaddrinfo.c | 24 +++++++++---------------
1 file changed, 9 insertions(+), 15 deletions(-)
diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
index d17b97d79a..6ae6744fe4 100644
--- a/sysdeps/posix/getaddrinfo.c
+++ b/sysdeps/posix/getaddrinfo.c
@@ -2404,22 +2404,17 @@ getaddrinfo (const char *name, const char *service,
struct addrinfo *q;
struct addrinfo *last = NULL;
char *canonname = NULL;
- bool malloc_results;
- size_t alloc_size = nresults * (sizeof (*results) + sizeof (size_t));
+ struct scratch_buffer buf;
+ scratch_buffer_init (&buf);
- malloc_results
- = !__libc_use_alloca (alloc_size);
- if (malloc_results)
+ if (!scratch_buffer_set_array_size (&buf, nresults,
+ sizeof (*results) + sizeof (size_t)))
{
- results = malloc (alloc_size);
- if (results == NULL)
- {
- __free_in6ai (in6ai);
- return EAI_MEMORY;
- }
+ __free_in6ai (in6ai);
+ return EAI_MEMORY;
}
- else
- results = alloca (alloc_size);
+ results = buf.data;
+
order = (size_t *) (results + nresults);
/* Now we definitely need the interface information. */
@@ -2590,8 +2585,7 @@ getaddrinfo (const char *name, const char *service,
/* Fill in the canonical name into the new first entry. */
p->ai_canonname = canonname;
- if (malloc_results)
- free (results);
+ scratch_buffer_free (&buf);
}
__free_in6ai (in6ai);
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-09-06 13:33 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-09-06 13:33 [glibc] getaddrinfo: Get rid of alloca Joe Simmons-Talbott
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).