RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[3party][opening_hours] Check if mktime failed in GetNextTimeState

Browse source 
Signed-off-by: David Martinez <47610359+dvdmrtnz@users.noreply.github.com>
This commit is contained in:
David Martinez 2022-06-11 16:43:29 +02:00 • committed by Viktor Govako
parent 9bb3ae5a80
commit b66de6e01b
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
3party/opening_hours/rules_evaluation.cpp
View file

@ -408,7 +408,10 @@ time_t GetNextTimeState(TRuleSequences const & rules, time_t const dateTime, Rul
tm tm = MakeTimetuple(dateTime);
tm.tm_hour = 0;
tm.tm_min = 0;
dateTimeToCheck = mktime(&tm) + i * (24 * 60 * 60);
dateTimeToCheck = mktime(&tm);
if (dateTimeToCheck == -1)
continue;
dateTimeToCheck += i * (24 * 60 * 60);
if (dateTimeToCheck < dateTime || dateTimeToCheck > dateTimeResult)
continue;
@ -427,7 +430,10 @@ time_t GetNextTimeState(TRuleSequences const & rules, time_t const dateTime, Rul
tm tm = MakeTimetuple(dateTime);
tm.tm_hour = time.GetEnd().GetHourMinutes().GetHoursCount();
tm.tm_min = time.GetEnd().GetHourMinutes().GetMinutesCount();
dateTimeToCheck = mktime(&tm) + i * (24 * 60 * 60) + 60; // 1 minute offset
dateTimeToCheck = mktime(&tm);
if (dateTimeToCheck == -1)
continue;
dateTimeToCheck += i * (24 * 60 * 60) + 60; // 1 minute offset
if (dateTimeToCheck < dateTime || dateTimeToCheck > dateTimeResult)
continue;
@ -444,7 +450,10 @@ time_t GetNextTimeState(TRuleSequences const & rules, time_t const dateTime, Rul
tm tm = MakeTimetuple(dateTime);
tm.tm_hour = time.GetStart().GetHourMinutes().GetHoursCount();
tm.tm_min = time.GetStart().GetHourMinutes().GetMinutesCount();
dateTimeToCheck = mktime(&tm) + i * (24 * 60 * 60);
dateTimeToCheck = mktime(&tm);
if (dateTimeToCheck == -1)
continue;
dateTimeToCheck += i * (24 * 60 * 60);
if (dateTimeToCheck < dateTime || dateTimeToCheck > dateTimeResult)
continue;