From: K.Kosako Date: Wed, 4 Sep 2019 00:25:41 +0000 (+0900) Subject: fix immature implementation of onigenc_get_right_adjust_char_head_with_prev() X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a014b47962ed0cd576d54288785ff668d66c9cdd;p=onig fix immature implementation of onigenc_get_right_adjust_char_head_with_prev() --- diff --git a/src/regenc.c b/src/regenc.c index aa72172..a486206 100644 --- a/src/regenc.c +++ b/src/regenc.c @@ -182,7 +182,8 @@ onigenc_get_right_adjust_char_head_with_prev(OnigEncoding enc, p += enclen(enc, p); } else { - if (prev) *prev = (const UChar* )NULL; /* Sorry */ + if (prev) + *prev = onigenc_get_prev_char_head(enc, start, p); } return p; } diff --git a/src/regexec.c b/src/regexec.c index 00ec7e7..e077064 100644 --- a/src/regexec.c +++ b/src/regexec.c @@ -4580,9 +4580,6 @@ forward_search(regex_t* reg, const UChar* str, const UChar* end, UChar* start, if (*low > start) { *low = onigenc_get_right_adjust_char_head_with_prev(reg->enc, start, *low, (const UChar** )low_prev); - if (low_prev && IS_NULL(*low_prev)) - *low_prev = onigenc_get_prev_char_head(reg->enc, - (pprev ? pprev : start), *low); } else { if (low_prev)