summaryrefslogtreecommitdiff
path: root/src/sjis.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/sjis.c
parent0f259c3073f341c48468e80e93731daa31698030 (diff)
parentb4158caf13bc715096c1df7c040c9d25995d76f2 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/sjis.c')
-rw-r--r--src/sjis.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/sjis.c b/src/sjis.c
index 1fd92d9..10afd9d 100644
--- a/src/sjis.c
+++ b/src/sjis.c
@@ -2,7 +2,7 @@
sjis.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
@@ -113,13 +113,15 @@ static int
code_to_mbclen(OnigCodePoint code)
{
if (code < 256) {
- return EncLen_SJIS[(int )code] == 1;
+ if (EncLen_SJIS[(int )code] == 1)
+ return 1;
}
- else if (code <= 0xffff) {
- return 2;
+ else if (code < 0x10000) {
+ if (EncLen_SJIS[(int )(code >> 8) & 0xff] == 2)
+ return 2;
}
- else
- return ONIGERR_INVALID_CODE_POINT_VALUE;
+
+ return ONIGERR_INVALID_CODE_POINT_VALUE;
}
static OnigCodePoint