Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PR/34055: Kevin Massey: Date uses a fixed 1K buffer for strftime

Browse Source 
but does not check when strftime fails because the buffer is too small.
Our implementation of strftime does not NUL terminat the buffer
on failure (it does not have to; the results are undefined), so
garbage gets printed. Use a dynamically allocated buffer instead.
This commit is contained in:
christos 2006-07-23 20:39:10 +00:00
parent 213f1e2476
commit 8a487b533d
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bin/date/date.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: date.c,v 1.42 2005/07/22 14:27:08 peter Exp $ */
/* $NetBSD: date.c,v 1.43 2006/07/23 20:39:10 christos Exp $ */
/*
* Copyright (c) 1985, 1987, 1988, 1993
@ -40,7 +40,7 @@ __COPYRIGHT(
#if 0
static char sccsid[] = "@(#)date.c 8.2 (Berkeley) 4/28/95";
#else
__RCSID("$NetBSD: date.c,v 1.42 2005/07/22 14:27:08 peter Exp $");
__RCSID("$NetBSD: date.c,v 1.43 2006/07/23 20:39:10 christos Exp $");
#endif
#endif /* not lint */
@ -74,7 +74,8 @@ static void usage(void);
int
main(int argc, char *argv[])
{
char buf[1024];
char *buf;
size_t bufsiz;
const char *format;
int ch;
@ -123,10 +124,16 @@ main(int argc, char *argv[])
if (*argv && **argv == '+')
format = *argv + 1;
(void)strftime(buf, sizeof(buf), format, localtime(&tval));
if ((buf = malloc(bufsiz = 1024)) == NULL)
goto bad;
while (strftime(buf, bufsiz, format, localtime(&tval)) == 0)
if ((buf = realloc(buf, bufsiz <<= 1)) == NULL)
goto bad;
(void)printf("%s\n", buf);
exit(retval);
/* NOTREACHED */
free(buf);
return 0;
bad:
err(1, "Cannot allocate format buffer");
}
static void