|
2 | 2 | * |
3 | 3 | * EUC_JP, SJIS and MULE_INTERNAL |
4 | 4 | * |
5 | | - * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group |
| 5 | + * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group |
6 | 6 | * Portions Copyright (c) 1994, Regents of the University of California |
7 | 7 | * |
8 | 8 | * IDENTIFICATION |
9 | | - * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/euc_jp_and_sjis.c,v 1.14 2005/12/26 19:30:44 momjian Exp $ |
| 9 | + * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/euc_jp_and_sjis.c,v 1.15 2006/03/04 10:57:35 ishii Exp $ |
10 | 10 | * |
11 | 11 | *------------------------------------------------------------------------- |
12 | 12 | */ |
|
22 | 22 | #definePGSJISALTCODE 0x81ac |
23 | 23 | #definePGEUCALTCODE 0xa2ae |
24 | 24 |
|
| 25 | +#defineISSJISHEAD(c) ((c >= 0x81 && c <= 0x9f) || (c >= 0xe0 && c <= 0xfc)) |
| 26 | +#defineISSJISTAIL(c) ((c >= 0x40 && c <= 0x7e) || (c >= 0x80 && c <= 0xfc)) |
| 27 | + |
25 | 28 | /* |
26 | 29 | * conversion table between SJIS UDC (IBM kanji) and EUC_JP |
27 | 30 | */ |
@@ -186,6 +189,11 @@ sjis2mic(unsigned char *sjis, unsigned char *p, int len) |
186 | 189 | * JIS X0208, X0212, user defined extended characters |
187 | 190 | */ |
188 | 191 | c2=*sjis++; |
| 192 | +if (!ISSJISHEAD(c1)|| !ISSJISTAIL(c2)) |
| 193 | +ereport(ERROR, |
| 194 | +(errcode(ERRCODE_CHARACTER_NOT_IN_REPERTOIRE), |
| 195 | +errmsg("invalid byte sequence for encoding \"SJIS\": 0x%02x%02x", |
| 196 | +c1,c2))); |
189 | 197 | k= (c1 <<8)+c2; |
190 | 198 | /* Eiji Tokuya patched begin */ |
191 | 199 | if (k >=0xed40&&k<0xf040) |
@@ -557,6 +565,11 @@ sjis2euc_jp(unsigned char *sjis, unsigned char *p, int len) |
557 | 565 | * JIS X0208, X0212, user defined extended characters |
558 | 566 | */ |
559 | 567 | c2=*sjis++; |
| 568 | +if (!ISSJISHEAD(c1)|| !ISSJISTAIL(c2)) |
| 569 | +ereport(ERROR, |
| 570 | +(errcode(ERRCODE_CHARACTER_NOT_IN_REPERTOIRE), |
| 571 | +errmsg("invalid byte sequence for encoding \"SJIS\": 0x%02x%02x", |
| 572 | +c1,c2))); |
560 | 573 | k= (c1 <<8)+c2; |
561 | 574 | if (k >=0xed40&&k<0xf040) |
562 | 575 | { |
|