fix immature implementation of onigenc_get_right_adjust_char_head_with_prev()

diff --git a/src/regenc.c b/src/regenc.c
index aa721724a41f5c18163b566cd4e1570f5f4e5d9d..a486206af277400e2a99c1c6e193b1e0bfdd0325 100644 (file)
--- 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 00ec7e77d37b191dbb933537a7223053d8d72f60..e0770643e0447a5a949f4c11bb85e9759f27c458 100644 (file)
--- 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)