gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Lexer: ::isDOM failed to enforce minimum size before allowing no endBoundary

Browse Source
This commit is contained in:
Paul Beckingham
2015-07-27 01:53:32 -04:00
parent c2f08c8f05
commit a5507678e8
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Lexer.cpp
View File

@@ -520,6 +520,7 @@ bool Lexer::isUUID (std::string& token, Lexer::Type& type, bool endBoundary)
{ {
std::size_t marker = _cursor; std::size_t marker = _cursor;
// Greedy.
std::size_t i = 0; std::size_t i = 0;
for (; i < 36 && marker + i < _eos; i++) for (; i < 36 && marker + i < _eos; i++)
{ {
@@ -532,11 +533,11 @@ bool Lexer::isUUID (std::string& token, Lexer::Type& type, bool endBoundary)
break; break;
} }
if (! endBoundary || if (i >= uuid_min_length &&
(i >= uuid_min_length && (! endBoundary ||
(_text[marker + i] == 0 || ! _text[marker + i] ||
isWhitespace (_text[marker + i]) || isWhitespace (_text[marker + i]) ||
isSingleCharOperator (_text[marker + i])))) isSingleCharOperator (_text[marker + i])))
{ {
token = _text.substr (_cursor, i); token = _text.substr (_cursor, i);
if (! isAllDigits (token)) if (! isAllDigits (token))