picnoir
/
Nix
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

Clearer error message when regex exceeds space limit

This commit is contained in:
Rhys 2017-06-30 14:14:50 +10:00
parent c7346a275c
commit 17bb00d378
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/libexpr/primops.cc
View File

@ -1734,8 +1734,13 @@ static void prim_match(EvalState & state, const Pos & pos, Value * * args, Value
mkString(*(v.listElems()[i] = state.allocValue()), match[i + 1].str().c_str());
}
} catch (std::regex_error &) {
throw EvalError("invalid regular expression ‘%s’, at %s", re, pos);
} 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);
}
}
}