* [committed] time: Remove alloca() from getdate
@ 2023-05-05 14:56 Siddhesh Poyarekar
0 siblings, 0 replies; only message in thread
From: Siddhesh Poyarekar @ 2023-05-05 14:56 UTC (permalink / raw)
To: libc-alpha; +Cc: Joe Simmons-Talbott
From: Joe Simmons-Talbott <josimmon@redhat.com>
Reduce the usage of alloca() to the bare minimum to avoid the potential
for stack overflow. Use __strndup to simplify the code.
Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
---
I had to fix up a whitespace issue before committing, this is what
finally went in.
Thanks,
Sid
time/getdate.c | 23 +++++------------------
1 file changed, 5 insertions(+), 18 deletions(-)
diff --git a/time/getdate.c b/time/getdate.c
index c5c8378707..1dcbd77188 100644
--- a/time/getdate.c
+++ b/time/getdate.c
@@ -26,7 +26,6 @@
#include <unistd.h>
#include <sys/stat.h>
#include <ctype.h>
-#include <alloca.h>
#define TM_YEAR_BASE 1900
@@ -153,26 +152,14 @@ __getdate_r (const char *string, struct tm *tp)
if (inlen < oldlen)
{
- bool using_malloc = false;
-
- if (__libc_use_alloca (inlen + 1))
- instr = alloca (inlen + 1);
- else
+ instr = __strndup(string, inlen);
+ if (instr == NULL)
{
- instr = malloc (inlen + 1);
- if (instr == NULL)
- {
- fclose (fp);
- return 6;
- }
- using_malloc = true;
+ fclose(fp);
+ return 6;
}
- memcpy (instr, string, inlen);
- instr[inlen] = '\0';
- string = instr;
- if (!using_malloc)
- instr = NULL;
+ string = instr;
}
line = NULL;
--
2.40.0
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-05-05 14:56 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-05 14:56 [committed] time: Remove alloca() from getdate Siddhesh Poyarekar
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).