database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-28 11:44:57 +03:00
Code Activity

Tighten up SJIS byte sequence check. Now we reject invalid SJIS byte

Browse Source 
sequence such as "0x95 0x27". Patches from Akio Ishida.
This commit is contained in:
Tatsuo Ishii
2006-03-04 12:32:59 +00:00
parent 11b3472672
commit 52c4e32d5f
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/euc_jp_and_sjis.c
View File

@@ -6,7 +6,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/euc_jp_and_sjis.c,v 1.5.2.1 2005/06/11 07:44:40 ishii Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/euc_jp_and_sjis.c,v 1.5.2.2 2006/03/04 12:32:59 ishii Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@@ -22,6 +22,9 @@
#define PGSJISALTCODE 0x81ac #define PGSJISALTCODE 0x81ac
#define PGEUCALTCODE 0xa2ae #define PGEUCALTCODE 0xa2ae
#define ISSJISHEAD(c) ((c >= 0x81 && c <= 0x9f) || (c >= 0xe0 && c <= 0xef))
#define ISSJISTAIL(c) ((c >= 0x40 && c <= 0x7e) || (c >= 0x80 && c <= 0xfc))
/* /*
* conversion table between SJIS UDC (IBM kanji) and EUC_JP * conversion table between SJIS UDC (IBM kanji) and EUC_JP
*/ */
@@ -192,6 +195,10 @@ sjis2mic(unsigned char *sjis, unsigned char *p, int len)
* JIS X0208, X0212, user defined extended characters * JIS X0208, X0212, user defined extended characters
*/ */
c2 = *sjis++; c2 = *sjis++;
if (!ISSJISHEAD(c1) || !ISSJISTAIL(c2))
elog(ERROR,"invalid byte sequence for encoding \"SJIS\": 0x%02x%02x",
c1, c2);
k = (c1 << 8) + c2; k = (c1 << 8) + c2;
/* Eiji Tokuya patched begin */ /* Eiji Tokuya patched begin */
if (k >= 0xed40 && k < 0xf040) if (k >= 0xed40 && k < 0xf040)