sharpetronics/PostgreSQL
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-16 00:02:54 -04:00
Code Issues Projects Releases Wiki 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 11:10:44 +00:00
parent cff68063de
commit 8ccc7dfaf1
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
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
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/euc_jp_and_sjis.c,v 1.13 2005/10/15 02:49:34 momjian Exp $
* $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/euc_jp_and_sjis.c,v 1.13.2.1 2006/03/04 11:10:44 ishii Exp $
*
*-------------------------------------------------------------------------
*/
@ -22,6 +22,9 @@
#define PGSJISALTCODE 0x81ac
#define PGEUCALTCODE 0xa2ae
#define ISSJISHEAD(c) ((c >= 0x81 && c <= 0x9f) || (c >= 0xe0 && c <= 0xfc))
#define ISSJISTAIL(c) ((c >= 0x40 && c <= 0x7e) || (c >= 0x80 && c <= 0xfc))
/*
* conversion table between SJIS UDC (IBM kanji) and EUC_JP
*/
@ -186,6 +189,11 @@ sjis2mic(unsigned char *sjis, unsigned char *p, int len)
* JIS X0208, X0212, user defined extended characters
*/
c2 = *sjis++;
if (!ISSJISHEAD(c1) || !ISSJISTAIL(c2))
ereport(ERROR,
(errcode(ERRCODE_CHARACTER_NOT_IN_REPERTOIRE),
errmsg("invalid byte sequence for encoding \"SJIS\": 0x%02x%02x",
c1, c2)));
k = (c1 << 8) + c2;
/* Eiji Tokuya patched begin */
if (k >= 0xed40 && k < 0xf040)
@ -561,6 +569,11 @@ sjis2euc_jp(unsigned char *sjis, unsigned char *p, int len)
* JIS X0208, X0212, user defined extended characters
*/
c2 = *sjis++;
if (!ISSJISHEAD(c1) || !ISSJISTAIL(c2))
ereport(ERROR,
(errcode(ERRCODE_CHARACTER_NOT_IN_REPERTOIRE),
errmsg("invalid byte sequence for encoding \"SJIS\": 0x%02x%02x",
c1, c2)));
k = (c1 << 8) + c2;
if (k >= 0xed40 && k < 0xf040)
{