feedc0de/date
1
0
Fork 0
forked from HowardHinnant/date
Code Pull Requests Activity

Fix for issue #79.

Browse Source 
parse was not checking failbit aggressively enough.
This commit is contained in:
acolomitchi
2016-09-09 17:34:47 +10:00
committed by Howard Hinnant
parent ea9f664a06
commit 3b3a27efe1
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
date.h
View File

@@ -4149,7 +4149,7 @@ parse(std::basic_istream<CharT, Traits>& is,
auto e = b + format.size(); auto e = b + format.size();
auto command = false; auto command = false;
auto modified = false; auto modified = false;
for (; i < e; ++i) for (; i < e && 0 == (err & ios_base::failbit); ++i)
{ {
switch (*i) switch (*i)
{ {
@@ -4166,11 +4166,21 @@ parse(std::basic_istream<CharT, Traits>& is,
if (command && !modified) if (command && !modified)
{ {
f.get(is, 0, is, err, &tm, b, i-1); f.get(is, 0, is, err, &tm, b, i-1);
if (err & ios_base::failbit)
{
command = modified = false;
break; // break the switch/case
}
b = i+1; b = i+1;
if (*i == 'T') if (*i == 'T')
{ {
const CharT hm[] = {'%', 'H', ':', '%', 'M', ':'}; const CharT hm[] = {'%', 'H', ':', '%', 'M', ':'};
f.get(is, 0, is, err, &tm, hm, hm+6); f.get(is, 0, is, err, &tm, hm, hm+6);
if (err & ios_base::failbit)
{
command = modified = false;
break; // break the switch/case
}
} }
if (ratio_less<typename Duration::period, ratio<1>>::value) if (ratio_less<typename Duration::period, ratio<1>>::value)
{ {
@@ -4302,6 +4312,8 @@ parse(std::basic_istream<CharT, Traits>& is,
} }
is.setstate(err); is.setstate(err);
} }
else
is.setstate(ios_base::failbit);
} }
} // namespace detail } // namespace detail