Commitfbee976

committed

getdatabaseencoding() and PG_encoding_to_char() were being sloppy about

converting char* strings to type 'name'. Imagine my surprise when 7.1release coredumped upon start when compiled --enable-multibyte ...

1 parent6ccb2af commitfbee976Copy full SHA for fbee976

File tree

+10

-7

lines changed

+10

-7

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.64 2001/03/22 04:00:00 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.65 2001/04/16 02:42:01 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -168,13 +168,13 @@ SetDataDir(const char *dir)`
`168`	`168`	`Datum`
`169`	`169`	`getdatabaseencoding(PG_FUNCTION_ARGS)`
`170`	`170`	`{`
`171`		`-PG_RETURN_NAME("SQL_ASCII");`
	`171`	`+returnDirectFunctionCall1(namein,CStringGetDatum("SQL_ASCII"));`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`Datum`
`175`	`175`	`PG_encoding_to_char(PG_FUNCTION_ARGS)`
`176`	`176`	`{`
`177`		`-PG_RETURN_NAME("SQL_ASCII");`
	`177`	`+returnDirectFunctionCall1(namein,CStringGetDatum("SQL_ASCII"));`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`Datum`

Lines changed: 3 additions & 2 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`	`* usable for both the backend and the frontend.`
`4`	`4`	`* Tatsuo Ishii`
`5`		`- * $Id: common.c,v 1.12 2001/02/11 01:59:22 ishii Exp $`
	`5`	`+ * $Id: common.c,v 1.13 2001/04/16 02:42:01 tgl Exp $`
`6`	`6`	`*/`
`7`	`7`	`#include"postgres.h"`
`8`	`8`
`@@ -91,8 +91,9 @@ Datum`
`91`	`91`	`PG_encoding_to_char(PG_FUNCTION_ARGS)`
`92`	`92`	`{`
`93`	`93`	`int32encoding=PG_GETARG_INT32(0);`
	`94`	`+constchar*encoding_name=pg_encoding_to_char(encoding);`
`94`	`95`
`95`		`-PG_RETURN_NAME(pg_encoding_to_char(encoding));`
	`96`	`+returnDirectFunctionCall1(namein,CStringGetDatum(encoding_name));`
`96`	`97`	`}`
`97`	`98`
`98`	`99`	`#endif`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`* client encoding and server internal encoding.`
`4`	`4`	`* (currently mule internal code (mic) is used)`
`5`	`5`	`* Tatsuo Ishii`
`6`		`- * $Id: mbutils.c,v 1.16 2001/03/08 00:24:34 tgl Exp $`
	`6`	`+ * $Id: mbutils.c,v 1.17 2001/04/16 02:42:01 tgl Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include"postgres.h"`
`9`	`9`
`@@ -287,5 +287,7 @@ GetDatabaseEncoding()`
`287`	`287`	`Datum`
`288`	`288`	`getdatabaseencoding(PG_FUNCTION_ARGS)`
`289`	`289`	`{`
`290`		`-PG_RETURN_NAME(pg_encoding_to_char(DatabaseEncoding));`
	`290`	`+constchar*encoding_name=pg_encoding_to_char(DatabaseEncoding);`
	`291`	`+`
	`292`	`+returnDirectFunctionCall1(namein,CStringGetDatum(encoding_name));`
`291`	`293`	`}`

Comments

(0)