49 lines
1.4 KiB
Diff
49 lines
1.4 KiB
Diff
|
From 9eda3000e3efd5bdd4ed60d07e2f43633e39d361 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
|
||
|
|
Date: Tue, 23 Apr 2024 19:22:22 +0900
|
||
|
|
Subject: [PATCH] merge revision(s) 33e5b47c16f1fd3382186e6ffe73cfc6e00946f7:
|
||
|
|
|
||
|
|
Fix handling of reg->dmin in Regex matching
|
||
|
|
|
||
|
|
---
|
||
|
|
regexec.c | 10 ++++++++++
|
||
|
|
1 file changed, 10 insertions(+)
|
||
|
|
---
|
||
|
|
regexec.c | 10 ++++++++++
|
||
|
|
1 file changed, 10 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/regexec.c b/regexec.c
|
||
|
|
index 4582c35c3f..36ac1d4bc5 100644
|
||
|
|
--- a/regexec.c
|
||
|
|
+++ b/regexec.c
|
||
|
|
@@ -3900,12 +3900,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)) {
|
||
|
|
@@ -4042,6 +4047,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;
|