Restore the previous behavior for enclen

To fix testcases failures.

Signed-off-by: Hiroshi Hatake <hatake@calyptia.com>

Author: cosmo0920

regexec.c

@@ -3092,7 +3092,8 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
 	}
 	else {
 	  STACK_PUSH_ALT(p + addr, s, sprev, pkeep); /* Push possible point. */
-	  n = enclen(encode, s, end);
+	  /* For approximating enclen. Strict version of enclen does not work here. */
+	  n = enclen_approximate(encode, s, end);
 	  STACK_PUSH_ABSENT_POS(absent, ABSENT_END_POS); /* Save the original pos. */
 	  STACK_PUSH_ALT(selfp, s + n, s, pkeep); /* Next iteration. */
 	  STACK_PUSH_ABSENT;

regparse.c

@@ -4659,7 +4659,15 @@ parse_char_class(Node** np, Node** asc_np, OnigToken* tok, UChar** src, UChar* e
 	  goto err;
 	}
 
-	len = enclen(env->enc, buf, buf + i);
+	if (env->enc == ONIG_ENCODING_EUC_JP ||
+		env->enc == ONIG_ENCODING_SJIS) {
+	  /* Strict version of enclen does not handle invalid single code
+	   * point for SJIS and EUC-JP...*/
+	  len = enclen_approximate(env->enc, buf, buf + i);
+	}
+	else {
+	  len = enclen(env->enc, buf, buf + i);
+	}
 	if (i < len) {
 	  r = ONIGERR_TOO_SHORT_MULTI_BYTE_STRING;
 	  goto err;