texlive[47626] Build/source/texk/web2c: ptexdir: More strict check

[commits+takuji at tug.org]

Revision: 47626
          http://tug.org/svn/texlive?view=revision&revision=47626
Author:   takuji
Date:     2018-05-06 13:16:15 +0200 (Sun, 06 May 2018)
Log Message:
-----------
ptexdir: More strict check kanji token

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/ptexdir/ChangeLog
    trunk/Build/source/texk/web2c/ptexdir/kanji.c
    trunk/Build/source/texk/web2c/uptexdir/kanji.c

Modified: trunk/Build/source/texk/web2c/ptexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/ptexdir/ChangeLog	2018-05-06 09:42:30 UTC (rev 47625)
+++ trunk/Build/source/texk/web2c/ptexdir/ChangeLog	2018-05-06 11:16:15 UTC (rev 47626)
@@ -1,3 +1,7 @@
+2018-05-06  Hironori Kitagawa  <h_kitagawa2001 at yahoo.co.jp>
+
+	* kanji.c: More strict check kanji token.
+
 2018-04-14  Hironori Kitagawa  <h_kitagawa2001 at yahoo.co.jp>
 
 	* ptex-base.ch: Fix issue GitHub:texjporg/tex-jp-build#57

Modified: trunk/Build/source/texk/web2c/ptexdir/kanji.c
===================================================================
--- trunk/Build/source/texk/web2c/ptexdir/kanji.c	2018-05-06 09:42:30 UTC (rev 47625)
+++ trunk/Build/source/texk/web2c/ptexdir/kanji.c	2018-05-06 11:16:15 UTC (rev 47626)
@@ -4,6 +4,7 @@
  */
 
 #include "kanji.h"
+#define CS_TOKEN_FLAG   0xFFFF
 
 #if !defined(WIN32)
 int sjisterminal;
@@ -12,7 +13,8 @@
 /* TOKEN */
 boolean check_kanji(integer c)
 {
-    return is_char_kanji(c);
+    if (c >= CS_TOKEN_FLAG) return false;
+    else return is_char_kanji(c);
 }
 
 boolean is_char_ascii(integer c)

Modified: trunk/Build/source/texk/web2c/uptexdir/kanji.c
===================================================================
--- trunk/Build/source/texk/web2c/uptexdir/kanji.c	2018-05-06 09:42:30 UTC (rev 47625)
+++ trunk/Build/source/texk/web2c/uptexdir/kanji.c	2018-05-06 11:16:15 UTC (rev 47626)
@@ -18,7 +18,7 @@
 /* TOKEN */
 boolean check_kanji (integer c)
 {
-    if (c > CS_TOKEN_FLAG) return false;
+    if (c >= CS_TOKEN_FLAG) return false;
     else if (!(XXHi(c)>=KCAT_KANJI && XXHi(c)<=KCAT_HANGUL)) return false;
     else return is_char_kanji(c);
 }