From 4216de6a3336cbc6dddb572cb7e6ab6193bf3729 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff.email>
Date: Fri, 29 Nov 2019 11:26:35 +0100
Subject: New upstream version 6.9.4

---
 src/big5.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'src/big5.c')

diff --git a/src/big5.c b/src/big5.c
index ff8bd3b..79ae1e3 100644
--- a/src/big5.c
+++ b/src/big5.c
@@ -2,7 +2,7 @@
   big5.c -  Oniguruma (regular expression library)
 **********************************************************************/
 /*-
- * Copyright (c) 2002-2018  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * Copyright (c) 2002-2019  K.Kosako
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -54,6 +54,16 @@ big5_mbc_enc_len(const UChar* p)
   return EncLen_BIG5[*p];
 }
 
+static int
+big5_code_to_mbclen(OnigCodePoint code)
+{
+  if ((code & (~0xffff)) != 0) return ONIGERR_INVALID_CODE_POINT_VALUE;
+  if ((code &    0xff00) != 0) return 2;
+  if (EncLen_BIG5[(int )(code & 0xff)] == 1) return 1;
+
+  return ONIGERR_INVALID_CODE_POINT_VALUE;
+}
+
 static int
 is_valid_mbc_string(const UChar* p, const UChar* end)
 {
@@ -99,15 +109,6 @@ big5_mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end,
                                    pp, end, lower);
 }
 
-#if 0
-static int
-big5_is_mbc_ambiguous(OnigCaseFoldType flag,
-                      const UChar** pp, const UChar* end)
-{
-  return onigenc_mbn_is_mbc_ambiguous(ONIG_ENCODING_BIG5, flag, pp, end);
-}
-#endif
-
 static int
 big5_is_code_ctype(OnigCodePoint code, unsigned int ctype)
 {
@@ -174,7 +175,7 @@ OnigEncodingType OnigEncodingBIG5 = {
   1,          /* min enc length */
   onigenc_is_mbc_newline_0x0a,
   big5_mbc_to_code,
-  onigenc_mb2_code_to_mbclen,
+  big5_code_to_mbclen,
   big5_code_to_mbc,
   big5_mbc_case_fold,
   onigenc_ascii_apply_all_case_fold,
-- 
cgit v1.2.3