diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2021-04-26 17:34:16 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2021-04-26 17:34:16 +0200 |
| commit | eac65ba44805c402f894b700b602c2e891f92a84 (patch) | |
| tree | 8c74372bd97a480de440013af1dda4958189e24e /src/euc_tw.c | |
| parent | 7ce72ba4d420fde9672c2fb2dd7a6f5a26815e26 (diff) | |
| parent | dbedac4783f09292abb187d0c59d4032594038b6 (diff) | |
Merge branch 'release/debian/6.9.6-1'debian/6.9.6-1
Diffstat (limited to 'src/euc_tw.c')
| -rw-r--r-- | src/euc_tw.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/euc_tw.c b/src/euc_tw.c index 8e72b97..99dc5ec 100644 --- a/src/euc_tw.c +++ b/src/euc_tw.c @@ -2,7 +2,7 @@ euc_tw.c - Oniguruma (regular expression library) **********************************************************************/ /*- - * Copyright (c) 2002-2019 K.Kosako + * Copyright (c) 2002-2020 K.Kosako * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -57,15 +57,22 @@ euctw_mbc_enc_len(const UChar* p) static int euctw_code_to_mbclen(OnigCodePoint code) { - if ((code & 0xff000000) != 0) return 4; - else if ((code & 0xff0000) != 0) return ONIGERR_INVALID_CODE_POINT_VALUE; - else if ((code & 0xff00) != 0) return 2; + if ((code & 0xff000000) != 0) { + if (EncLen_EUCTW[(int )(code >> 24) & 0xff] == 4) + return 4; + } + else if ((code & 0xff0000) != 0) + return ONIGERR_INVALID_CODE_POINT_VALUE; + else if ((code & 0xff00) != 0) { + if (EncLen_EUCTW[(int )(code >> 8) & 0xff] == 2) + return 2; + } else { if (EncLen_EUCTW[(int )(code & 0xff)] == 1) return 1; - - return ONIGERR_INVALID_CODE_POINT_VALUE; } + + return ONIGERR_INVALID_CODE_POINT_VALUE; } static int |