Commitac47950

committed

Guard against 0 length string encoding conversion case.

1 parent9645fa8 commitac47950Copy full SHA for ac47950

File tree

-1

lines changed

-1

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`* (currently mule internal code (mic) is used)`
`5`	`5`	`* Tatsuo Ishii`
`6`	`6`	`*`
`7`		`- * $Header: /cvsroot/pgsql/src/backend/utils/mb/mbutils.c,v 1.36 2002/11/02 18:41:22 tgl Exp $`
	`7`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/mb/mbutils.c,v 1.37 2002/11/26 02:22:29 ishii Exp $`
`8`	`8`	`*/`
`9`	`9`	`#include"postgres.h"`
`10`	`10`
`@@ -165,6 +165,9 @@ pg_do_encoding_conversion(unsigned char *src, int len,`
`165`	`165`	`if (src_encoding==PG_SQL_ASCII\|\|dest_encoding==PG_SQL_ASCII)`
`166`	`166`	`returnsrc;`
`167`	`167`
	`168`	`+if (len <=0)`
	`169`	`+returnsrc;`
	`170`	`+`
`168`	`171`	`proc=FindDefaultConversionProc(src_encoding,dest_encoding);`
`169`	`172`	`if (!OidIsValid(proc))`
`170`	`173`	`{`
`@@ -320,6 +323,9 @@ perform_default_encoding_conversion(unsigned char *src, int len, bool is_client_`
`320`	`323`	`dest_encoding;`
`321`	`324`	`FmgrInfo*flinfo;`
`322`	`325`
	`326`	`+if (len <=0)`
	`327`	`+returnsrc;`
	`328`	`+`
`323`	`329`	`if (is_client_to_server)`
`324`	`330`	`{`
`325`	`331`	`src_encoding=ClientEncoding->encoding;`

Comments

(0)