Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-03 07:08:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Add defensive check for localtime_r() call

Browse source
This commit is contained in:
Pete Nelson 2015-03-14 16:56:35 -04:00
parent 5e2defebe5
commit 3ef2cd70a4
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/util.cc
View file

@ -1356,9 +1356,13 @@ double calc_next_rotate(double current, double interval, double base)
time_t teatime = time_t(current); time_t teatime = time_t(current);
struct tm t; struct tm t;
t = *localtime_r(&teatime, &t); if ( ! localtime_r(&teatime, &t) )
t.tm_hour = t.tm_min = t.tm_sec = 0; {
double startofday = mktime(&t); reporter->Error("calc_next_rotate(): can't parse current time");
// fall back to the method used if no base time is given
base = -1;
}
if ( base < 0 ) if ( base < 0 )
// No base time given. To get nice timestamps, we round // No base time given. To get nice timestamps, we round
@ -1367,6 +1371,8 @@ double calc_next_rotate(double current, double interval, double base)
+ interval - current; + interval - current;
// current < startofday + base + i * interval <= current + interval // current < startofday + base + i * interval <= current + interval
t.tm_hour = t.tm_min = t.tm_sec = 0;
double startofday = mktime(&t);
return startofday + base + return startofday + base +
ceil((current - startofday - base) / interval) * interval - ceil((current - startofday - base) / interval) * interval -
current; current;