Skip to content

cron::cron_next : check cronexpr initialized to avoid endless recursion #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AverageBeerEnjoyer wants to merge 1 commit into
base: master
Choose a base branch
from
Open

cron::cron_next : check cronexpr initialized to avoid endless recursion #37

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions include/croncpp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,8 @@ namespace cron
friend std::string to_cronstr(cronexpr const& cex);
friend std::string to_string(cronexpr const & cex);

friend bool is_initialized(cronexpr const& cex);

template <typename Traits>
friend cronexpr make_cron(CRONCPP_STRING_VIEW expr);
};
Expand All @@ -230,6 +232,10 @@ namespace cron
return !(e1 == e2);
}

inline bool is_initialized(cronexpr const& cex ){
return !cex.expr.empty();
}

inline std::string to_string(cronexpr const & cex)
{
return
Expand Down Expand Up @@ -865,6 +871,8 @@ namespace cron
template <typename Traits = cron_standard_traits>
static std::tm cron_next(cronexpr const & cex, std::tm date)
{
if(!is_initialized(cex))
throw bad_cronexpr("Cron expr is not initialized");
time_t original = utils::tm_to_time(date);
if (INVALID_TIME == original) return {};

Expand All @@ -887,6 +895,8 @@ namespace cron
template <typename Traits = cron_standard_traits>
static std::time_t cron_next(cronexpr const & cex, std::time_t const & date)
{
if(!is_initialized(cex))
throw bad_cronexpr("Cron expr is not initialized");
std::tm val;
std::tm* dt = utils::time_to_tm(&date, &val);
if (dt == nullptr) return INVALID_TIME;
Expand Down