merge revision(s) 33e5b47c16f1fd3382186e6ffe73cfc6e00946f7:

	Fix handling of reg->dmin in Regex matching

	---
	 regexec.c | 10 ++++++++++
	 1 file changed, 10 insertions(+)

2 files changed, 11 insertions, 1 deletions

diff --git a/regexec.c b/regexec.c
index a7b948e99c..549de7a6ab 100644
--- a/regexec.c
+++ b/regexec.c
@@ -3904,12 +3904,17 @@ forward_search_range(regex_t* reg, const UChar* str, const UChar* end, UChar* s,
 		     UChar* range, UChar** low, UChar** high, UChar** low_prev)
 {
   UChar *p, *pprev = (UChar* )NULL;
+  size_t input_len = end - str;
 
 #ifdef ONIG_DEBUG_SEARCH
   fprintf(stderr, "forward_search_range: str: %"PRIuPTR" (%p), end: %"PRIuPTR" (%p), s: %"PRIuPTR" (%p), range: %"PRIuPTR" (%p)\n",
 	  (uintptr_t )str, str, (uintptr_t )end, end, (uintptr_t )s, s, (uintptr_t )range, range);
 #endif
 
+  if (reg->dmin > input_len) {
+    return 0;
+  }
+
   p = s;
   if (reg->dmin > 0) {
     if (ONIGENC_IS_SINGLEBYTE(reg->enc)) {
@@ -4046,6 +4051,11 @@ backward_search_range(regex_t* reg, const UChar* str, const UChar* end,
 		      UChar** low, UChar** high)
 {
   UChar *p;
+  size_t input_len = end - str;
+
+  if (reg->dmin > input_len) {
+    return 0;
+  }
 
   range += reg->dmin;
   p = s;
diff --git a/version.h b/version.h
index 323ae26e01..3bdae6afe4 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,7 @@
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 4
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 249
+#define RUBY_PATCHLEVEL 250
 
 #define RUBY_RELEASE_YEAR 2024
 #define RUBY_RELEASE_MONTH 4