summaryrefslogtreecommitdiff
path: root/src/euc_kr.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2020-11-08 10:59:08 +0100
committerJörg Frings-Fürst <debian@jff.email>2020-11-08 10:59:08 +0100
commit22bb4b319b3d722ac7bf041a6374cd40afdc4d53 (patch)
treea07d7d0764a8488f4b5ebef1561e2f3d8caacc05 /src/euc_kr.c
parent0f259c3073f341c48468e80e93731daa31698030 (diff)
parentb4158caf13bc715096c1df7c040c9d25995d76f2 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/euc_kr.c')
-rw-r--r--src/euc_kr.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/euc_kr.c b/src/euc_kr.c
index 7fa50af..b0e9fbf 100644
--- a/src/euc_kr.c
+++ b/src/euc_kr.c
@@ -2,7 +2,7 @@
euc_kr.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
@@ -58,8 +58,15 @@ static int
euckr_code_to_mbclen(OnigCodePoint code)
{
if ((code & (~0xffff)) != 0) return ONIGERR_INVALID_CODE_POINT_VALUE;
- if ((code & 0xff00) != 0) return 2;
- if (EncLen_EUCKR[(int )(code & 0xff)] == 1) return 1;
+
+ if ((code & 0xff00) != 0) {
+ if (EncLen_EUCKR[(int )(code >> 8) & 0xff] == 2)
+ return 2;
+ }
+ else {
+ if (EncLen_EUCKR[(int )(code & 0xff)] == 1)
+ return 1;
+ }
return ONIGERR_INVALID_CODE_POINT_VALUE;
}