sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix to date mask parsing; put in a safety cutoffs when asserts are enabled

Browse source
This commit is contained in:
John Wiegley 2004-09-23 01:52:47 -04:00
parent 61b007e58d
commit e9f0dc8bb9
2 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
datetime.cc
View file

@ -47,8 +47,17 @@ std::time_t interval_t::first(const std::time_t moment)
} }
std::time_t temp; std::time_t temp;
while (std::difftime(moment, temp = increment(quant)) > 0) #if DEBUG_LEVEL >= RELEASE
int cutoff = 10000;
#endif
while (std::difftime(moment, temp = increment(quant)) > 0) {
if (quant == temp)
break;
quant = temp; quant = temp;
#if DEBUG_LEVEL >= RELEASE
assert(--cutoff > 0);
#endif
}
} }
return quant; return quant;
@ -90,7 +99,8 @@ static void parse_inclusion_specifier(const std::string& word,
struct std::tm when; struct std::tm when;
if (! parse_date_mask(word.c_str(), &when)) if (! parse_date_mask(word.c_str(), &when))
throw interval_expr_error("Could not parse 'in' date mask"); throw interval_expr_error(std::string("Could not parse date mask: ") +
word);
when.tm_hour = 0; when.tm_hour = 0;
when.tm_min = 0; when.tm_min = 0;

11
walk.cc
View file

@ -275,9 +275,18 @@ void interval_transactions::operator()(transaction_t& xact)
} }
std::time_t temp; std::time_t temp;
#if DEBUG_LEVEL >= RELEASE
int cutoff = 10000;
#endif
while (std::difftime(xact.entry->date, while (std::difftime(xact.entry->date,
temp = interval.increment(quant)) > 0) temp = interval.increment(quant)) > 0) {
if (quant == temp)
break;
quant = temp; quant = temp;
#if DEBUG_LEVEL >= RELEASE
assert(--cutoff > 0);
#endif
}
interval.begin = quant; interval.begin = quant;
} }