emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

w: Check return values in print_logintime().

Browse Source
This commit is contained in:
Qualys Security Advisory 1970-01-01 00:00:00 +00:00 committed by Craig Small
parent ed3cf6988a
commit 0151441e15
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
w.c
View File

@ -283,10 +283,8 @@ static time_t idletime(const char *restrict const tty)
} }
/* 7 character formatted login time */ /* 7 character formatted login time */
static void print_logintime(time_t logt, FILE * fout) static void print_logintime(time_t logt, FILE * fout)
{ {
/* Abbreviated of weekday can be longer than 3 characters, /* Abbreviated of weekday can be longer than 3 characters,
* see for instance hu_HU. Using 16 is few bytes more than * see for instance hu_HU. Using 16 is few bytes more than
* enough. */ * enough. */
@ -296,23 +294,29 @@ static void print_logintime(time_t logt, FILE * fout)
int today; int today;
curt = time(NULL); curt = time(NULL);
if (curt == (time_t)(-1)) goto error;
curtm = localtime(&curt); curtm = localtime(&curt);
if (!curtm) goto error;
/* localtime returns a pointer to static memory */ /* localtime returns a pointer to static memory */
today = curtm->tm_yday; today = curtm->tm_yday;
logtm = localtime(&logt); logtm = localtime(&logt);
if (!logtm) goto error;
if (curt - logt > 12 * 60 * 60 && logtm->tm_yday != today) { if (curt - logt > 12 * 60 * 60 && logtm->tm_yday != today) {
if (curt - logt > 6 * 24 * 60 * 60) { if (curt - logt > 6 * 24 * 60 * 60) {
strftime(time_str, sizeof(time_str), "%b", logtm); if (!strftime(time_str, sizeof(time_str), "%b", logtm)) goto error;
fprintf(fout, " %02d%3s%02d", logtm->tm_mday, fprintf(fout, " %02d%3s%02d", logtm->tm_mday,
time_str, logtm->tm_year % 100); time_str, logtm->tm_year % 100);
} else { } else {
strftime(time_str, sizeof(time_str), "%a", logtm); if (!strftime(time_str, sizeof(time_str), "%a", logtm)) goto error;
fprintf(fout, " %3s%02d ", time_str, fprintf(fout, " %3s%02d ", time_str,
logtm->tm_hour); logtm->tm_hour);
} }
} else { } else {
fprintf(fout, " %02d:%02d ", logtm->tm_hour, logtm->tm_min); fprintf(fout, " %02d:%02d ", logtm->tm_hour, logtm->tm_min);
} }
return;
error:
fprintf(fout, " ???????");
} }
/* /*