kloenk/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Merge pull request #1428 from rimmington/clearer-regex-space-error

Browse source 
Clearer error message when regex exceeds space limit
This commit is contained in:
Eelco Dolstra 2017-07-10 11:45:05 +02:00 committed by GitHub
parent d3713716b6 17bb00d378
commit 1762b9616c
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/libexpr/primops.cc
View file

@ -1734,10 +1734,15 @@ static void prim_match(EvalState & state, const Pos & pos, Value * * args, Value
mkString(*(v.listElems()[i] = state.allocValue()), match[i + 1].str().c_str()); mkString(*(v.listElems()[i] = state.allocValue()), match[i + 1].str().c_str());
} }
} catch (std::regex_error &) { } catch (std::regex_error &e) {
if (e.code() == std::regex_constants::error_space) {
// limit is _GLIBCXX_REGEX_STATE_LIMIT for libstdc++
throw EvalError("memory limit exceeded by regular expression ‘%s’, at %s", re, pos);
} else {
throw EvalError("invalid regular expression ‘%s’, at %s", re, pos); throw EvalError("invalid regular expression ‘%s’, at %s", re, pos);
} }
} }
}
static void prim_concatStringSep(EvalState & state, const Pos & pos, Value * * args, Value & v) static void prim_concatStringSep(EvalState & state, const Pos & pos, Value * * args, Value & v)