about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRhys <rimmington@gmail.com>2017-06-30T04·14+1000
committerRhys <rimmington@gmail.com>2017-07-09T23·35+1000
commit17bb00d378aea9ea7f7f27618bd736f2c47e3de2 (patch)
tree10aa109c5a38bedbc656bd138122f768c1454664
parentc7346a275c4cdcb59b3961241ddc52b79452d716 (diff)
Clearer error message when regex exceeds space limit
-rw-r--r--src/libexpr/primops.cc9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index 99ffddaeb80c..f240e795ee79 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -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);
+        }
     }
 }