Commit0c1e2e4

committed

set client_encoding to <nothing> crashes backend.

1 parent507a0a2 commit0c1e2e4Copy full SHA for 0c1e2e4

File tree

+13

-4

lines changed

+13

-4

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`* This file contains some public functions`
`3`	`3`	`* usable for both the backend and the frontend.`
`4`	`4`	`* Tatsuo Ishii`
`5`		`- * $Id: common.c,v 1.3 1998/10/06 03:02:21 momjian Exp $ */`
	`5`	`+ * $Id: common.c,v 1.4 1999/05/13 10:28:25 ishii Exp $ */`
`6`	`6`
`7`	`7`	`#include<stdlib.h>`
`8`	`8`
`@@ -28,6 +28,10 @@ pg_char_to_encoding(const char *s)`
`28`	`28`	`{`
`29`	`29`	`pg_encoding_conv_tbl*p=pg_conv_tbl;`
`30`	`30`
	`31`	`+if (!s) {`
	`32`	`+return (-1);`
	`33`	`+}`
	`34`	`+`
`31`	`35`	`for (;p->encoding >=0;p++)`
`32`	`36`	`{`
`33`	`37`	`if (!strcasecmp(s,p->name))`

Lines changed: 8 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`* This file contains some public functions`
`3`	`3`	`* related to show/set/reset variable commands.`
`4`	`4`	`* Tatsuo Ishii`
`5`		`- * $Id: variable.c,v 1.2 1998/09/01 04:33:24 momjian Exp $`
	`5`	`+ * $Id: variable.c,v 1.3 1999/05/13 10:28:26 ishii Exp $`
`6`	`6`	`*/`
`7`	`7`
`8`	`8`	`#include"mb/pg_wchar.h"`
`@@ -13,8 +13,13 @@ parse_client_encoding(const char *value)`
`13`	`13`	`intencoding;`
`14`	`14`
`15`	`15`	`encoding=pg_valid_client_encoding(value);`
`16`		`-if (encoding<0)`
`17`		`-elog(ERROR,"Client encoding %s is not supported",value);`
	`16`	`+if (encoding<0) {`
	`17`	`+if (value) {`
	`18`	`+elog(ERROR,"Client encoding %s is not supported",value);`
	`19`	`+}else {`
	`20`	`+elog(ERROR,"No client encoding is specified");`
	`21`	`+}`
	`22`	`+}`
`18`	`23`	`else`
`19`	`24`	`{`
`20`	`25`	`if (pg_set_client_encoding(encoding))`

Comments

(0)