VesperOS/shadow
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

src/chage.c: Unify long overflow checks in print_day_as_date()

Browse Source 
The conversion from day to seconds can be done in print_date
(renamed to print_day_as_date for clarification).  This has the nice
benefit that DAY multiplication and long to time_t conversion are done
at just one place.

Co-developed-by: Tobias Stoeckmann <tobias@stoeckmann.org>
Co-developed-by: Alejandro Colomar <alx@kernel.org>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
This commit is contained in:
Tobias Stoeckmann
2023-12-14 12:33:35 +01:00
committed by Serge Hallyn
parent 7eb10e6298
commit 20100e4b22
1 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/chage.c
View File

@@ -76,7 +76,7 @@ static long expdate;
/* local function prototypes */
NORETURN static void usage (int status);
static int new_fields (void);
static void print_date (time_t date);
static void print_day_as_date (long day);
static void list_fields (void);
static void process_flags (int argc, char **argv);
static void check_flags (int argc, int opt_index);
@@ -231,10 +231,22 @@ static int new_fields (void)
return 1;
}
static void print_date (time_t date)
static void
print_day_as_date(long day)
{
struct tm *tp;
char buf[80];
char buf[80];
time_t date;
struct tm *tp;
if (day < 0) {
puts(_("never"));
return;
}
if (__builtin_mul_overflow(day, DAY, &date)) {
puts(_("future"));
return;
}
tp = gmtime (&date);
if (NULL == tp) {
@@ -245,6 +257,7 @@ static void print_date (time_t date)
}
}
/*
* list_fields - display the current values of the expiration fields
*
@@ -254,21 +267,15 @@ static void print_date (time_t date)
*/
static void list_fields (void)
{
long changed = 0;
long expires;
/*
* The "last change" date is either "never" or the date the password
* was last modified. The date is the number of days since 1/1/1970.
*/
(void) fputs (_("Last password change\t\t\t\t\t: "), stdout);
if (lstchgdate < 0 || lstchgdate > LONG_MAX / DAY) {
(void) puts (_("never"));
} else if (lstchgdate == 0) {
if (lstchgdate == 0) {
(void) puts (_("password must be changed"));
} else {
changed = lstchgdate * DAY;
print_date (changed);
print_day_as_date(lstchgdate);
}
/*
@@ -281,11 +288,11 @@ static void list_fields (void)
} else if ( (lstchgdate < 0)
|| (maxdays >= 10000)
|| (maxdays < 0)
|| ((LONG_MAX - changed) / DAY < maxdays)) {
|| (LONG_MAX - lstchgdate < maxdays))
{
(void) puts (_("never"));
} else {
expires = changed + maxdays * DAY;
print_date (expires);
print_day_as_date(lstchgdate + maxdays);
}
/*
@@ -301,12 +308,12 @@ static void list_fields (void)
|| (inactdays < 0)
|| (maxdays >= 10000)
|| (maxdays < 0)
|| (maxdays > LONG_MAX - inactdays)
|| ((LONG_MAX - changed) / DAY < maxdays + inactdays)) {
|| (LONG_MAX - inactdays < maxdays)
|| (LONG_MAX - lstchgdate < maxdays + inactdays))
{
(void) puts (_("never"));
} else {
expires = changed + (maxdays + inactdays) * DAY;
print_date (expires);
print_day_as_date(lstchgdate + maxdays + inactdays);
}
/*
@@ -314,12 +321,7 @@ static void list_fields (void)
* password expiring or not.
*/
(void) fputs (_("Account expires\t\t\t\t\t\t: "), stdout);
if (expdate < 0 || LONG_MAX / DAY < expdate) {
(void) puts (_("never"));
} else {
expires = expdate * DAY;
print_date (expires);
}
print_day_as_date(expdate);
/*
* Start with the easy numbers - the number of days before the