Merge tag 'upstream/6.1.2'

Upstream version 6.1.2

1 files changed, 36 insertions, 2 deletions

diff --git a/src/gb18030.c b/src/gb18030.c
index 36fc3de..c8b5865 100644
--- a/src/gb18030.c
+++ b/src/gb18030.c
@@ -76,9 +76,43 @@ gb18030_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_GB18030, s, end);
+  while (p < end) {
+    if (*p < 0x80) {
+      p++;
+    }
+    else if (*p == 0x80 || *p == 0xff) {
+      return FALSE;
+    }
+    else {
+      p++;
+      if (p >= end) return FALSE;
+      if (*p < 0x40) {
+	if (*p < 0x30 || *p > 0x39)
+	  return FALSE;
+
+	p++;
+	if (p >= end) return FALSE;
+	if (*p < 0x81 || *p == 0xff) return FALSE;
+
+	p++;
+	if (p >= end) return FALSE;
+	if (*p < 0x30 || *p > 0x39)
+	  return FALSE;
+
+	p++;
+      }
+      else if (*p == 0x7f || *p == 0xff) {
+	return FALSE;
+      }
+      else {
+	p++;
+      }
+    }
+  }
+
+  return TRUE;
 }
 
 static OnigCodePoint