1
0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-08-05 08:10:15 +02:00

Don't segfault for a long header date string, e.g.,

echo a|pr -D +%9999999A

(init_header): Use x2nrealloc, rather than alloca.
Don't bother with fixed-sized initial buffer;  always use x*alloc.
This commit is contained in:
Jim Meyering
2005-03-10 08:51:49 +00:00
parent 6eb7488b32
commit 82477b8efb
+10 -9
View File
@@ -1657,8 +1657,7 @@ print_files (int number_of_files, char **av)
static void
init_header (char *filename, int desc)
{
char *buf;
char initbuf[MAX (256, INT_BUFSIZE_BOUND (long int))];
char *buf = NULL;
struct stat st;
struct tm *tm;
@@ -1668,25 +1667,27 @@ init_header (char *filename, int desc)
if (desc < 0 || fstat (desc, &st) != 0)
st.st_mtime = time (NULL);
buf = initbuf;
tm = localtime (&st.st_mtime);
if (! tm)
sprintf (buf, "%ld", (long int) st.st_mtime);
if (tm == NULL)
{
buf = xmalloc (INT_BUFSIZE_BOUND (long int));
sprintf (buf, "%ld", (long int) st.st_mtime);
}
else
{
size_t bufsize = sizeof initbuf;
size_t bufsize = 0;
for (;;)
{
buf = x2nrealloc (buf, &bufsize, sizeof *buf);
*buf = '\1';
if (strftime (buf, bufsize, date_format, tm) || ! *buf)
if (strftime (buf, bufsize, date_format, tm) || *buf == '\0')
break;
buf = alloca (bufsize *= 2);
}
}
if (date_text)
free (date_text);
date_text = xstrdup (buf);
date_text = buf;
file_text = custom_header ? custom_header : desc < 0 ? "" : filename;
header_width_available = (chars_per_line
- mbswidth (date_text, 0)