diff options
author | Martin v. Löwis <martin@v.loewis.de> | 2002-11-23 22:10:29 +0000 |
---|---|---|
committer | Martin v. Löwis <martin@v.loewis.de> | 2002-11-23 22:10:29 +0000 |
commit | a3d874fe98b9276cbfe6fd13327e970fe8c4766f (patch) | |
tree | 7d31c5d5625e880ee0c9cc8225e0fd9ebd70167d /Modules/unicodedata.c | |
parent | f504c248f998692179054a5c7a843b4f13fa98f0 (diff) | |
download | cpython-a3d874fe98b9276cbfe6fd13327e970fe8c4766f.tar.gz |
Verify that the code in CJK UNIFIED IDEOGRAPH- actually denotes an ideograph.
Diffstat (limited to 'Modules/unicodedata.c')
-rw-r--r-- | Modules/unicodedata.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/Modules/unicodedata.c b/Modules/unicodedata.c index 502b5bd855..c5ba6fc4b4 100644 --- a/Modules/unicodedata.c +++ b/Modules/unicodedata.c @@ -581,6 +581,15 @@ static char *hangul_syllables[][3] = { }; static int +is_unified_ideograph(Py_UCS4 code) +{ + return ( + (0x3400 <= code && code <= 0x4DB5) || /* CJK Ideograph Extension A */ + (0x4E00 <= code && code <= 0x9FA5) || /* CJK Ideograph */ + (0x20000 <= code && code <= 0x2A6D6));/* CJK Ideograph Extension B */ +} + +static int _getucname(Py_UCS4 code, char* buffer, int buflen) { int offset; @@ -610,9 +619,7 @@ _getucname(Py_UCS4 code, char* buffer, int buflen) return 1; } - if ((0x3400 <= code && code <= 0x4DB5) || /* CJK Ideograph Extension A */ - (0x4E00 <= code && code <= 0x9FA5) || /* CJK Ideograph */ - (0x20000 <= code && code <= 0x2A6D6)) {/* CJK Ideograph Extension B */ + if (is_unified_ideograph(code)) { if (buflen < 28) /* Worst case: CJK UNIFIED IDEOGRAPH-20000 */ return 0; @@ -743,6 +750,8 @@ _getcode(const char* name, int namelen, Py_UCS4* code) return 0; name++; } + if (!is_unified_ideograph(v)) + return 0; *code = v; return 1; } |