Make joni.regex_max_length opt-in as it will break existing users wit…

…h big intentional regexps
jruby · Jul 24, 2024 · 03ac9a5 · 03ac9a5
1 parent 486d1dd
commit 03ac9a5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/org/joni/Config.java b/src/org/joni/Config.java
@@ -22,7 +22,7 @@
 import java.io.PrintStream;
 
 public interface Config extends org.jcodings.Config {
-    final int REGEX_MAX_LENGTH = ConfigSupport.getInt("joni.regex_max_length", 15000);
+    final int REGEX_MAX_LENGTH = ConfigSupport.getInt("joni.regex_max_length", -1);
     final int CHAR_TABLE_SIZE = ConfigSupport.getInt("joni.char_table_size", 256);
     final boolean USE_NO_INVALID_QUANTIFIER = ConfigSupport.getBoolean("joni.use_no_invalid_quantifier", true);
     final int SCANENV_MEMNODES_SIZE = ConfigSupport.getInt("joni.scanenv_memnodes_size", 8);

diff --git a/src/org/joni/Regex.java b/src/org/joni/Regex.java
@@ -151,7 +151,7 @@ public Regex(byte[]bytes, int p, int end, int option, Encoding enc, Syntax synta
 
     // onig_alloc_init
     public Regex(byte[]bytes, int p, int end, int option, int caseFoldFlag, Encoding enc, Syntax syntax, WarnCallback warnings) {
-        if ((end - p) > Config.REGEX_MAX_LENGTH) {
+        if (Config.REGEX_MAX_LENGTH > 0 && (end - p) > Config.REGEX_MAX_LENGTH) {
             throw new ValueException(ErrorMessages.REGEX_TOO_LONG);
         }