isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use gmtime_r() and localtime_r() instead of gmtime() and localtime().

Browse Source
This commit is contained in:
Todd C. Miller
2021-09-17 10:55:06 -06:00
parent fa71679b5a
commit 18f1884ddc
15 changed files with 135 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
plugins/sudoers/getdate.c
View File

@@ -577,7 +577,7 @@ Convert(time_t Month, time_t Day, time_t Year, time_t Hours, time_t Minutes,
static int DaysInMonth[12] = {
31, 0, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
};
struct tm *tm;
struct tm tm;
time_t tod;
time_t Julian;
int i;
@@ -610,7 +610,7 @@ Convert(time_t Month, time_t Day, time_t Year, time_t Hours, time_t Minutes,
return -1;
Julian += tod;
if (DSTmode == DSTon
|| (DSTmode == DSTmaybe && (tm = localtime(&Julian)) && tm->tm_isdst))
|| (DSTmode == DSTmaybe && localtime_r(&Julian, &tm) && tm.tm_isdst))
Julian -= 60 * 60;
return Julian;
}
@@ -619,18 +619,16 @@ Convert(time_t Month, time_t Day, time_t Year, time_t Hours, time_t Minutes,
static time_t
DSTcorrect(time_t Start, time_t Future)
{
struct tm *start_tm;
struct tm *future_tm;
struct tm start_tm;
struct tm future_tm;
time_t StartDay;
time_t FutureDay;
start_tm = localtime(&Start);
future_tm = localtime(&Future);
if (!start_tm || !future_tm)
if (!localtime_r(&Start, &start_tm) || !localtime_r(&Future, &future_tm))
return -1;
StartDay = (start_tm->tm_hour + 1) % 24;
FutureDay = (future_tm->tm_hour + 1) % 24;
StartDay = (start_tm.tm_hour + 1) % 24;
FutureDay = (future_tm.tm_hour + 1) % 24;
return (Future - Start) + (StartDay - FutureDay) * 60L * 60L;
}
@@ -638,13 +636,13 @@ DSTcorrect(time_t Start, time_t Future)
static time_t
RelativeDate(time_t Start, time_t DayOrdinal, time_t DayNumber)
{
struct tm *tm;
struct tm tm;
time_t now;
now = Start;
if (!(tm = localtime(&now)))
if (!localtime_r(&now, &tm))
return -1;
now += SECSPERDAY * ((DayNumber - tm->tm_wday + 7) % 7);
now += SECSPERDAY * ((DayNumber - tm.tm_wday + 7) % 7);
now += 7 * SECSPERDAY * (DayOrdinal <= 0 ? DayOrdinal : DayOrdinal - 1);
return DSTcorrect(Start, now);
}
@@ -653,20 +651,20 @@ RelativeDate(time_t Start, time_t DayOrdinal, time_t DayNumber)
static time_t
RelativeMonth(time_t Start, time_t RelMonth)
{
struct tm *tm;
struct tm tm;
time_t Month;
time_t Year;
if (RelMonth == 0)
return 0;
if (!(tm = localtime(&Start)))
if (!localtime_r(&Start, &tm))
return -1;
Month = 12 * (tm->tm_year + 1900) + tm->tm_mon + RelMonth;
Month = 12 * (tm.tm_year + 1900) + tm.tm_mon + RelMonth;
Year = Month / 12;
Month = Month % 12 + 1;
return DSTcorrect(Start,
Convert(Month, (time_t)tm->tm_mday, Year,
(time_t)tm->tm_hour, (time_t)tm->tm_min, (time_t)tm->tm_sec,
Convert(Month, (time_t)tm.tm_mday, Year,
(time_t)tm.tm_hour, (time_t)tm.tm_min, (time_t)tm.tm_sec,
MER24, DSTmaybe));
}
@@ -855,7 +853,7 @@ difftm(struct tm *a, struct tm *b)
time_t
get_date(char *p)
{
struct tm *tm, *gmt, gmtbuf;
struct tm tm, gmt;
time_t Start;
time_t tod;
time_t now;
@@ -864,36 +862,19 @@ get_date(char *p)
yyInput = p;
(void)time (&now);
gmt = gmtime (&now);
if (gmt != NULL)
{
/* Make a copy, in case localtime modifies *tm (I think
that comment now applies to *gmt, but I am too
lazy to dig into how gmtime and locatime allocate the
structures they return pointers to). */
gmtbuf = *gmt;
gmt = &gmtbuf;
}
if (! (tm = localtime (&now)))
if (gmtime_r (&now, &gmt) == NULL)
return -1;
if (gmt != NULL)
tz = difftm (gmt, tm) / 60;
else
/* We are on a system like VMS, where the system clock is
in local time and the system has no concept of timezones.
Hopefully we can fake this out (for the case in which the
user specifies no timezone) by just saying the timezone
is zero. */
tz = 0;
if (localtime_r (&now, &tm) == NULL)
return -1;
if(tm->tm_isdst)
tz = difftm (&gmt, &tm) / 60;
if (tm.tm_isdst)
tz += 60;
yyYear = tm->tm_year + 1900;
yyMonth = tm->tm_mon + 1;
yyDay = tm->tm_mday;
yyYear = tm.tm_year + 1900;
yyMonth = tm.tm_mon + 1;
yyDay = tm.tm_mday;
yyTimezone = tz;
yyDSTmode = DSTmaybe;
yyHour = 0;
@@ -921,7 +902,7 @@ get_date(char *p)
else {
Start = now;
if (!yyHaveRel)
Start -= ((tm->tm_hour * 60L + tm->tm_min) * 60L) + tm->tm_sec;
Start -= ((tm.tm_hour * 60L + tm.tm_min) * 60L) + tm.tm_sec;
}
Start += yyRelSeconds;
@@ -962,7 +943,7 @@ main(int argc, char *argv[])
/* NOTREACHED */
}
#endif /* TEST */
#line 952 "getdate.c"
#line 933 "getdate.c"
/* allocate initial stack or double stack size, up to YYMAXDEPTH */
static int yygrowstack(void)
{
@@ -1442,7 +1423,7 @@ case 41:
yyval.Meridian = yyvsp[0].Meridian;
}
break;
#line 1432 "getdate.c"
#line 1413 "getdate.c"
}
yyssp -= yym;
yystate = *yyssp;