Commitbc2cf76

committed

Make makeObjectName multibyte aware. Currently, it may produce

incorrect multibyte sequence while truncating too long names.

1 parent88d7b4a commitbc2cf76Copy full SHA for bc2cf76

File tree

+12

-1

lines changed

+12

-1

lines changed

Lines changed: 12 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1996-2000, PostgreSQL, Inc`
`7`	`7`	`* Portions Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- *$Id: analyze.c,v 1.154 2000/08/11 23:45:27 tgl Exp $`
	`9`	`+ *$Id: analyze.c,v 1.155 2000/08/22 12:59:04 ishii Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -30,6 +30,10 @@`
`30`	`30`	`#include"utils/relcache.h"`
`31`	`31`	`#include"utils/syscache.h"`
`32`	`32`
	`33`	`+#ifdefMULTIBYTE`
	`34`	`+#include"mb/pg_wchar.h"`
	`35`	`+#endif`
	`36`	`+`
`33`	`37`	`voidCheckSelectForUpdate(Queryqry);/ no points for style... */`
`34`	`38`
`35`	`39`	`staticQuerytransformStmt(ParseStatepstate,Node*stmt);`
`@@ -550,6 +554,13 @@ makeObjectName(char name1, char name2, char *typename)`
`550`	`554`	`name2chars--;`
`551`	`555`	`}`
`552`	`556`
	`557`	`+#ifdefMULTIBYTE`
	`558`	`+if (name1)`
	`559`	`+name1chars=pg_mbcliplen(name1,name1chars,name1chars);`
	`560`	`+if (name2)`
	`561`	`+name2chars=pg_mbcliplen(name2,name2chars,name2chars);`
	`562`	`+#endif`
	`563`	`+`
`553`	`564`	`/* Now construct the string using the chosen lengths */`
`554`	`565`	`name=palloc(name1chars+name2chars+overhead+1);`
`555`	`566`	`strncpy(name,name1,name1chars);`

Comments

(0)