archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Correct castings to use OnigDistance

Browse source
This commit is contained in:
TSUYUSATO Kitsune 2025-07-29 00:44:44 +09:00 • committed by Hiroshi SHIBATA
parent 0eb1ed4f26
commit 94aabd3415
1 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

38
regexec.c
View file

@ -4684,7 +4684,7 @@ forward_search_range(regex_t* reg, const UChar* str, const UChar* end, UChar* s,
p = s; p = s;
if (reg->dmin != 0) { if (reg->dmin != 0) {
if ((ptrdiff_t)(end - p) <= (ptrdiff_t)reg->dmin) return 0; /* fail */ if ((OnigDistance)(end - p) <= reg->dmin) return 0; /* fail */
if (ONIGENC_IS_SINGLEBYTE(reg->enc)) { if (ONIGENC_IS_SINGLEBYTE(reg->enc)) {
p += reg->dmin; p += reg->dmin;
} }
@ -4727,7 +4727,7 @@ forward_search_range(regex_t* reg, const UChar* str, const UChar* end, UChar* s,
} }
if (p && p < range) { if (p && p < range) {
if ((ptrdiff_t)(p - s) < (ptrdiff_t)reg->dmin) { if ((OnigDistance)(p - s) < reg->dmin) {
retry_gate: retry_gate:
pprev = p; pprev = p;
p += enclen(reg->enc, p, end); p += enclen(reg->enc, p, end);
@ -4775,7 +4775,7 @@ forward_search_range(regex_t* reg, const UChar* str, const UChar* end, UChar* s,
} }
else { else {
if (reg->dmax != ONIG_INFINITE_DISTANCE) { if (reg->dmax != ONIG_INFINITE_DISTANCE) {
if ((ptrdiff_t)(p - str) < (ptrdiff_t)reg->dmax) { if ((OnigDistance)(p - str) < reg->dmax) {
*low = (UChar* )str; *low = (UChar* )str;
if (low_prev) if (low_prev)
*low_prev = onigenc_get_prev_char_head(reg->enc, str, *low, end); *low_prev = onigenc_get_prev_char_head(reg->enc, str, *low, end);
@ -4797,7 +4797,7 @@ forward_search_range(regex_t* reg, const UChar* str, const UChar* end, UChar* s,
} }
} }
/* no needs to adjust *high, *high is used as range check only */ /* no needs to adjust *high, *high is used as range check only */
if ((ptrdiff_t)(p - str) < (ptrdiff_t)reg->dmin) if ((OnigDistance)(p - str) < reg->dmin)
*high = (UChar* )str; *high = (UChar* )str;
else else
*high = p - reg->dmin; *high = p - reg->dmin;
@ -4906,13 +4906,13 @@ backward_search_range(regex_t* reg, const UChar* str, const UChar* end,
} }
if (reg->dmax != ONIG_INFINITE_DISTANCE) { if (reg->dmax != ONIG_INFINITE_DISTANCE) {
if ((ptrdiff_t)(p - str) < (ptrdiff_t)reg->dmax) if ((OnigDistance)(p - str) < reg->dmax)
*low = (UChar* )str; *low = (UChar* )str;
else else
*low = p - reg->dmax; *low = p - reg->dmax;
if (reg->dmin != 0) { if (reg->dmin != 0) {
if ((ptrdiff_t)(p - str) < (ptrdiff_t)reg->dmin) if ((OnigDistance)(p - str) < reg->dmin)
*high = (UChar* )str; *high = (UChar* )str;
else else
*high = p - reg->dmin; *high = p - reg->dmin;
@ -5059,17 +5059,17 @@ onig_search_gpos(regex_t* reg, const UChar* str, const UChar* end,
min_semi_end = max_semi_end = (UChar* )end; min_semi_end = max_semi_end = (UChar* )end;
end_buf: end_buf:
if ((ptrdiff_t)(max_semi_end - str) < (ptrdiff_t)reg->anchor_dmin) if ((OnigDistance)(max_semi_end - str) < reg->anchor_dmin)
goto mismatch_no_msa; goto mismatch_no_msa;
if (range > start) { if (range > start) {
if ((ptrdiff_t)(min_semi_end - start) > (ptrdiff_t)reg->anchor_dmax) { if ((OnigDistance)(min_semi_end - start) > reg->anchor_dmax) {
start = min_semi_end - reg->anchor_dmax; start = min_semi_end - reg->anchor_dmax;
if (start < end) if (start < end)
start = onigenc_get_right_adjust_char_head(reg->enc, str, start, end); start = onigenc_get_right_adjust_char_head(reg->enc, str, start, end);
} }
if ((ptrdiff_t)(max_semi_end - (range - 1)) < (ptrdiff_t)reg->anchor_dmin) { if ((OnigDistance)(max_semi_end - (range - 1)) < reg->anchor_dmin) {
if ((ptrdiff_t)(max_semi_end - str + 1) < (ptrdiff_t)reg->anchor_dmin) if ((OnigDistance)(max_semi_end - str + 1) < reg->anchor_dmin)
goto mismatch_no_msa; goto mismatch_no_msa;
else else
range = max_semi_end - reg->anchor_dmin + 1; range = max_semi_end - reg->anchor_dmin + 1;
@ -5080,11 +5080,11 @@ onig_search_gpos(regex_t* reg, const UChar* str, const UChar* end,
Backward search is used. */ Backward search is used. */
} }
else { else {
if ((ptrdiff_t)(min_semi_end - range) > (ptrdiff_t)reg->anchor_dmax) { if ((OnigDistance)(min_semi_end - range) > reg->anchor_dmax) {
range = min_semi_end - reg->anchor_dmax; range = min_semi_end - reg->anchor_dmax;
} }
if ((ptrdiff_t)(max_semi_end - start) < (ptrdiff_t)reg->anchor_dmin) { if ((OnigDistance)(max_semi_end - start) < reg->anchor_dmin) {
if ((ptrdiff_t)(max_semi_end - str) < (ptrdiff_t)reg->anchor_dmin) if ((OnigDistance)(max_semi_end - str) < reg->anchor_dmin)
goto mismatch_no_msa; goto mismatch_no_msa;
else { else {
start = max_semi_end - reg->anchor_dmin; start = max_semi_end - reg->anchor_dmin;
@ -5172,7 +5172,7 @@ onig_search_gpos(regex_t* reg, const UChar* str, const UChar* end,
if (reg->dmax == ONIG_INFINITE_DISTANCE) if (reg->dmax == ONIG_INFINITE_DISTANCE)
sch_range = (UChar* )end; sch_range = (UChar* )end;
else { else {
if ((ptrdiff_t)(end - range) < (ptrdiff_t)reg->dmax) if ((OnigDistance)(end - range) < reg->dmax)
sch_range = (UChar* )end; sch_range = (UChar* )end;
else { else {
sch_range = (UChar* )range + reg->dmax; sch_range = (UChar* )range + reg->dmax;
@ -5244,15 +5244,15 @@ onig_search_gpos(regex_t* reg, const UChar* str, const UChar* end,
else else
adjrange = (UChar* )end; adjrange = (UChar* )end;
if ((ptrdiff_t)(end - range) > (ptrdiff_t)reg->dmin) if ((OnigDistance)(end - range) > reg->dmin)
min_range = range + reg->dmin; min_range = range + reg->dmin;
else else
min_range = end; min_range = end;
if (reg->dmax != ONIG_INFINITE_DISTANCE && if (reg->dmax != ONIG_INFINITE_DISTANCE &&
(ptrdiff_t)(end - range) >= (ptrdiff_t)reg->threshold_len) { end - range >= reg->threshold_len) {
do { do {
if ((ptrdiff_t)(end - s) > (ptrdiff_t)reg->dmax) if ((OnigDistance)(end - s) > reg->dmax)
sch_start = s + reg->dmax; sch_start = s + reg->dmax;
else else
sch_start = (UChar* )end; sch_start = (UChar* )end;
@ -5273,13 +5273,13 @@ onig_search_gpos(regex_t* reg, const UChar* str, const UChar* end,
goto mismatch; goto mismatch;
} }
else { /* check only. */ else { /* check only. */
if ((ptrdiff_t)(end - range) < (ptrdiff_t)reg->threshold_len) goto mismatch; if (end - range < reg->threshold_len) goto mismatch;
if (reg->dmax != 0) { if (reg->dmax != 0) {
if (reg->dmax == ONIG_INFINITE_DISTANCE) if (reg->dmax == ONIG_INFINITE_DISTANCE)
sch_start = (UChar* )end; sch_start = (UChar* )end;
else { else {
if ((ptrdiff_t)(end - s) > (ptrdiff_t)reg->dmax) { if ((OnigDistance)(end - s) > reg->dmax) {
sch_start = s + reg->dmax; sch_start = s + reg->dmax;
sch_start = ONIGENC_LEFT_ADJUST_CHAR_HEAD(reg->enc, sch_start = ONIGENC_LEFT_ADJUST_CHAR_HEAD(reg->enc,
start, sch_start, end); start, sch_start, end);