Add a crash gurard to pg_encoding_mblen in case of an invalid encoding

tatsuo-ishii · tatsuo-ishii · commit b9be04e63dcb · 2001-04-19T02:34:35.000Z
given.
diff --git a/src/backend/utils/mb/wchar.c b/src/backend/utils/mb/wchar.c
@@ -1,7 +1,7 @@
 /*
  * conversion functions between pg_wchar and multi-byte streams.
  * Tatsuo Ishii
- * $Id: wchar.c,v 1.17 2001/03/22 04:00:05 momjian Exp $
+ * $Id: wchar.c,v 1.18 2001/04/19 02:34:35 ishii Exp $
  *
  * WIN1250 client encoding updated by Pavel Behal
  *
@@ -502,5 +502,5 @@ pg_mic_mblen(const unsigned char *mbstr)
 int
 pg_encoding_mblen(int encoding, const unsigned char *mbstr)
 {
-	return ((*pg_wchar_table[encoding].mblen) (mbstr));
+	return( (encoding >= 0 && encoding < sizeof(pg_wchar_table)/sizeof(pg_wchar_tbl))? ((*pg_wchar_table[encoding].mblen) (mbstr)) : ((*pg_wchar_table[SQL_ASCII].mblen) (mbstr)));
 }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/*`
`2`	`2`	`* conversion functions between pg_wchar and multi-byte streams.`
`3`	`3`	`* Tatsuo Ishii`
`4`		`- * $Id: wchar.c,v 1.17 2001/03/22 04:00:05 momjian Exp $`
	`4`	`+ * $Id: wchar.c,v 1.18 2001/04/19 02:34:35 ishii Exp $`
`5`	`5`	`*`
`6`	`6`	`* WIN1250 client encoding updated by Pavel Behal`
`7`	`7`	`*`
`@@ -502,5 +502,5 @@ pg_mic_mblen(const unsigned char *mbstr)`
`502`	`502`	`int`
`503`	`503`	`pg_encoding_mblen(int encoding, const unsigned char *mbstr)`
`504`	`504`	`{`
`505`		`- return ((*pg_wchar_table[encoding].mblen) (mbstr));`
	`505`	`+ return( (encoding >= 0 && encoding < sizeof(pg_wchar_table)/sizeof(pg_wchar_tbl))? ((pg_wchar_table[encoding].mblen) (mbstr)) : ((pg_wchar_table[SQL_ASCII].mblen) (mbstr)));`
`506`	`506`	`}`