NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitd80e73f

committed

Fix output of char node fields

WRITE_CHAR_FIELD() didn't do any escaping, so that for example a zerobyte would cause the whole output string to be truncated. To fix, passthe char through outToken(), so it is escaped like a string. Adjust thereading side to handle this.

1 parent5191e35 commitd80e73fCopy full SHA for d80e73f

File tree

2 files changed

+21

-2

lines changed

src/backend/nodes
- outfuncs.c
- readfuncs.c

2 files changed

+21

-2

lines changed

`‎src/backend/nodes/outfuncs.c`

Lines changed: 19 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,8 @@`
`32`	`32`	`#include"utils/datum.h"`
`33`	`33`	`#include"utils/rel.h"`
`34`	`34`
	`35`	`+staticvoidoutChar(StringInfostr,charc);`
	`36`	`+`
`35`	`37`
`36`	`38`	`/*`
`37`	`39`	`* Macros to simplify output of different kinds of fields. Use these`
`@@ -62,7 +64,8 @@`
`62`	`64`
`63`	`65`	`/* Write a char field (ie, one ascii character) */`
`64`	`66`	`#defineWRITE_CHAR_FIELD(fldname) \`
`65`		`-appendStringInfo(str, " :" CppAsString(fldname) " %c", node->fldname)`
	`67`	`+(appendStringInfo(str, " :" CppAsString(fldname) " "), \`
	`68`	`+ outChar(str, node->fldname))`
`66`	`69`
`67`	`70`	`/* Write an enumerated-type field as an integer code */`
`68`	`71`	`#defineWRITE_ENUM_FIELD(fldname,enumtype) \`
`@@ -140,6 +143,21 @@ outToken(StringInfo str, const char *s)`
`140`	`143`	`}`
`141`	`144`	`}`
`142`	`145`
	`146`	`+/*`
	`147`	`+ * Convert one char. Goes through outToken() so that special characters are`
	`148`	`+ * escaped.`
	`149`	`+ */`
	`150`	`+staticvoid`
	`151`	`+outChar(StringInfostr,charc)`
	`152`	`+{`
	`153`	`+charin[2];`
	`154`	`+`
	`155`	`+in[0]=c;`
	`156`	`+in[1]='\0';`
	`157`	`+`
	`158`	`+outToken(str,in);`
	`159`	`+}`
	`160`	`+`
`143`	`161`	`staticvoid`
`144`	`162`	`_outList(StringInfostr,constList*node)`
`145`	`163`	`{`

`‎src/backend/nodes/readfuncs.c`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,8 @@`
`86`	`86`	`#defineREAD_CHAR_FIELD(fldname) \`
`87`	`87`	`token = pg_strtok(&length);/* skip :fldname */ \`
`88`	`88`	`token=pg_strtok(&length);/* get field value */ \`
`89`		`-local_node->fldname=token[0]`
	`89`	`+/* avoid overhead of calling debackslash() for one char */ \`
	`90`	`+local_node->fldname= (length==0) ?'\0' : (token[0]=='\\' ?token[1] :token[0])`
`90`	`91`
`91`	`92`	`/* Read an enumerated-type field that was written as an integer code */`
`92`	`93`	`#defineREAD_ENUM_FIELD(fldname,enumtype) \`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitd80e73f

File tree

2 files changed

2 files changed

`‎src/backend/nodes/outfuncs.c`

`‎src/backend/nodes/readfuncs.c`

0 commit comments