From: Tatsuo Ishii <ishii@postgresql.org>
Date: Sat, 4 Mar 2006 12:32:59 +0000 (+0000)
Subject: Tighten up SJIS byte sequence check. Now we reject invalid SJIS byte
X-Git-Tag: REL7_3_15~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=52c4e32d5f578369cf28157d7f5c3aa48762aa96;p=thirdparty%2Fpostgresql.git

Tighten up SJIS byte sequence check. Now we reject invalid SJIS byte
sequence such as "0x95 0x27". Patches from Akio Ishida.
---

diff --git a/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/euc_jp_and_sjis.c b/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/euc_jp_and_sjis.c
index e9fd625b0bb..155eb66b2bf 100644
--- a/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/euc_jp_and_sjis.c
+++ b/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/euc_jp_and_sjis.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * 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 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
  */
@@ -192,6 +195,10 @@ sjis2mic(unsigned char *sjis, unsigned char *p, int len)
 			 * JIS X0208, X0212, user defined extended characters
 			 */
 			c2 = *sjis++;
+			if (!ISSJISHEAD(c1) || !ISSJISTAIL(c2))
+				elog(ERROR,"invalid byte sequence for encoding \"SJIS\": 0x%02x%02x",
+				     c1, c2);
+
 			k = (c1 << 8) + c2;
 /* Eiji Tokuya patched begin */
 			if (k >= 0xed40 && k < 0xf040)