New upstream version 6.1.2upstream/6.1.2

1 files changed, 35 insertions, 2 deletions

diff --git a/src/euc_tw.c b/src/euc_tw.c
index 4e07567..b3ee628 100644
--- a/src/euc_tw.c
+++ b/src/euc_tw.c
@@ -55,9 +55,42 @@ euctw_mbc_enc_len(const UChar* p)
 }
 
 static int
-is_valid_mbc_string(const UChar* s, const UChar* end)
+is_valid_mbc_string(const UChar* p, const UChar* end)
 {
-  return onigenc_length_check_is_valid_mbc_string(ONIG_ENCODING_EUC_TW, s, end);
+  while (p < end) {
+    if (*p < 0x80) {
+      p++;
+    }
+    else if (*p < 0xa1) {
+      if (*p == 0x8e) {
+	p++;
+	if (p >= end) return FALSE;
+	if (*p < 0xa1 || *p > 0xb0) return FALSE;
+	p++;
+	if (p >= end) return FALSE;
+	if (*p < 0xa1 || *p == 0xff)
+	  return FALSE;
+	p++;
+	if (p >= end) return FALSE;
+	if (*p < 0xa1 || *p == 0xff)
+	  return FALSE;
+	p++;
+      }
+      else
+	return FALSE;
+    }
+    else if (*p < 0xff) {
+      p++;
+      if (p >= end) return FALSE;
+      if (*p < 0xa1 || *p == 0xff)
+	return FALSE;
+      p++;
+    }
+    else
+      return FALSE;
+  }
+
+  return TRUE;
 }
 
 static OnigCodePoint