mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2024-12-21 23:18:00 -08:00
Code

printtime: use the Unix epoch if the file's timestamp is invalid

Browse Source 
Fixes a crash in "ls -l" for files with bogus timestamp values.
OK miod@ denis@
This commit is contained in:
millert 2024-03-27 14:44:52 +00:00
parent 5348ece403
commit ba906cc60a
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bin/ls/print.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: print.c,v 1.40 2023/10/07 11:51:08 schwarze Exp $ */
/* $OpenBSD: print.c,v 1.41 2024/03/27 14:44:52 millert Exp $ */
/* $NetBSD: print.c,v 1.15 1996/12/11 03:25:39 thorpej Exp $ */
/*
@ -241,6 +241,7 @@ static void
printtime(time_t ftime)
{
char f_date[DATELEN];
struct tm *tm;
static time_t now;
static int now_set = 0;
@ -252,9 +253,14 @@ printtime(time_t ftime)
/*
* convert time to string, and print
*/
if ((tm = localtime(&ftime)) == NULL) {
/* Invalid time stamp, just display the epoch. */
ftime = 0;
tm = localtime(&ftime);
}
if (strftime(f_date, sizeof(f_date), f_sectime ? "%b %e %H:%M:%S %Y" :
(ftime <= now - SIXMONTHS || ftime > now) ? "%b %e %Y" :
"%b %e %H:%M", localtime(&ftime)) == 0)
"%b %e %H:%M", tm) == 0)
f_date[0] = '\0';
printf("%s ", f_date);