diff options
| author | NARUSE, Yui <nurse@users.noreply.github.com> | 2024-03-20 20:00:47 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-20 11:00:47 +0000 |
| commit | 7ae8abc23961bf4fa143a7a2cc0bc38167d468ae (patch) | |
| tree | a6b394c23f85b719d125f0cdf8364b79ca5542a1 /regexec.c | |
| parent | bd42c1725a3bba0f97831aa3dbaa6924f506a5f3 (diff) | |
merge revision(s) bb59696614083660241ef272f222628cbfa95844: [Backport #20098] (#10298)
Fix [Bug #20098]: set counter value for {n,m} repetition correctly (#9391)
Diffstat (limited to 'regexec.c')
| -rw-r--r-- | regexec.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -704,11 +704,11 @@ init_cache_opcodes(const regex_t* reg, OnigCacheOpcode* cache_opcodes, long* num OnigRepeatRange *repeat_range = ®->repeat_range[repeat_mem]; if (repeat_range->lower < repeat_range->upper) { INC_CACHE_OPCODES; - cache_point--; + cache_point -= lookaround_nesting != 0 ? 2 : 1; } cache_point -= num_cache_points_in_repeat; int repeat_bounds = repeat_range->upper == 0x7fffffff ? 1 : repeat_range->upper - repeat_range->lower; - cache_point += num_cache_points_in_repeat * repeat_range->lower + (num_cache_points_in_repeat + 1) * repeat_bounds; + cache_point += num_cache_points_in_repeat * repeat_range->lower + (num_cache_points_in_repeat + (lookaround_nesting != 0 ? 2 : 1)) * repeat_bounds; OnigCacheOpcode* cache_opcodes_in_repeat = cache_opcodes - 1; while (cache_opcodes_at_repeat <= cache_opcodes_in_repeat) { cache_opcodes_in_repeat->num_cache_points_in_outer_repeat = num_cache_points_in_repeat; @@ -2542,6 +2542,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end, MATCH_CACHE_DEBUG;\ if (msa->match_cache_buf[match_cache_point_index] & match_cache_point_mask) {\ MATCH_CACHE_DEBUG_HIT;\ + if (*pbegin == OP_REPEAT_INC) stkp->u.repeat.count--;\ if (cache_opcode->lookaround_nesting == 0) goto fail;\ else if (cache_opcode->lookaround_nesting < 0) {\ if (check_extended_match_cache_point(msa->match_cache_buf, match_cache_point_index, match_cache_point_mask)) {\ |