* [PATCH] time: Remove alloca() from getdate
@ 2023-04-26 13:57 Joe Simmons-Talbott
2023-04-26 15:20 ` Joe Simmons-Talbott
0 siblings, 1 reply; 2+ messages in thread
From: Joe Simmons-Talbott @ 2023-04-26 13:57 UTC (permalink / raw)
To: libc-alpha; +Cc: Joe Simmons-Talbott
Reduce the usage of alloca() to the bare minimum to avoid the potential
for stack overflow. Use __strndup to simplify the code.
---
time/getdate.c | 21 +--------------------
1 file changed, 1 insertion(+), 20 deletions(-)
diff --git a/time/getdate.c b/time/getdate.c
index c5c8378707..204308da1e 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,8 @@ __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 = malloc (inlen + 1);
- if (instr == NULL)
- {
- fclose (fp);
- return 6;
- }
- using_malloc = true;
- }
- memcpy (instr, string, inlen);
- instr[inlen] = '\0';
+ instr = __strndup(string, inlen);
string = instr;
-
- if (!using_malloc)
- instr = NULL;
}
line = NULL;
--
2.39.2
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] time: Remove alloca() from getdate
2023-04-26 13:57 [PATCH] time: Remove alloca() from getdate Joe Simmons-Talbott
@ 2023-04-26 15:20 ` Joe Simmons-Talbott
0 siblings, 0 replies; 2+ messages in thread
From: Joe Simmons-Talbott @ 2023-04-26 15:20 UTC (permalink / raw)
To: libc-alpha
On Wed, Apr 26, 2023 at 09:57:17AM -0400, Joe Simmons-Talbott wrote:
> Reduce the usage of alloca() to the bare minimum to avoid the potential
> for stack overflow. Use __strndup to simplify the code.
>
> ---
> time/getdate.c | 21 +--------------------
> 1 file changed, 1 insertion(+), 20 deletions(-)
>
> diff --git a/time/getdate.c b/time/getdate.c
> index c5c8378707..204308da1e 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,8 @@ __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 = malloc (inlen + 1);
> - if (instr == NULL)
> - {
> - fclose (fp);
> - return 6;
> - }
> - using_malloc = true;
> - }
> - memcpy (instr, string, inlen);
> - instr[inlen] = '\0';
> + instr = __strndup(string, inlen);
I neglected to add error handling for __strndup(). v2 coming shortly.
Thanks,
Joe
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-04-26 15:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-26 13:57 [PATCH] time: Remove alloca() from getdate Joe Simmons-Talbott
2023-04-26 15:20 ` 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).