Merge branch '2.4.2' into lexer2

This commit is contained in:
Paul Beckingham 2015-02-22 14:46:30 -05:00
commit e1c0d5b130
3 changed files with 7 additions and 4 deletions

View file

@ -770,7 +770,8 @@ bool Lexer2::isPath (std::string& token, Lexer2::Type& type)
else
break;
if (! isWhitespace (_text[marker]) &&
if (_text[marker] &&
! isWhitespace (_text[marker]) &&
_text[marker] != '/')
{
utf8_next_char (_text, marker);