Commitf205095

Thomas G. Lockhart

committed

Guard against NULL strings in SET key=val constructs.

Problem noted by Fernando Nasser.

1 parentee21548 commitf205095Copy full SHA for f205095

File tree

-4

lines changed

-4

lines changed

Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.288 2002/03/08 04:37:17 tgl Exp $`
	`14`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.289 2002/03/09 17:37:16 thomas Exp $`
`15`	`15`	`*`
`16`	`16`	`* HISTORY`
`17`	`17`	`* AUTHORDATEMAJOR EVENT`
`@@ -790,14 +790,16 @@ VariableSetStmt: SET ColId TO var_value`
`790`	`790`	`{`
`791`	`791`	`VariableSetStmt *n = makeNode(VariableSetStmt);`
`792`	`792`	`n->name =$2;`
`793`		`-n->args = makeList1(makeStringConst($4,NULL));`
	`793`	`+if ($4 !=NULL)`
	`794`	`+n->args = makeList1(makeStringConst($4,NULL));`
`794`	`795`	`$$ = (Node *) n;`
`795`	`796`	`}`
`796`	`797`	`\|SETColId'='var_value`
`797`	`798`	`{`
`798`	`799`	`VariableSetStmt *n = makeNode(VariableSetStmt);`
`799`	`800`	`n->name =$2;`
`800`		`-n->args = makeList1(makeStringConst($4,NULL));`
	`801`	`+if ($4 !=NULL)`
	`802`	`+n->args = makeList1(makeStringConst($4,NULL));`
`801`	`803`	`$$ = (Node *) n;`
`802`	`804`	`}`
`803`	`805`	`\|SETTIMEZONEzone_value`
`@@ -826,7 +828,8 @@ VariableSetStmt: SET ColId TO var_value`
`826`	`828`	`{`
`827`	`829`	`VariableSetStmt *n = makeNode(VariableSetStmt);`
`828`	`830`	`n->name ="client_encoding";`
`829`		`-n->args = makeList1(makeStringConst($3,NULL));`
	`831`	`+if ($3 !=NULL)`
	`832`	`+n->args = makeList1(makeStringConst($3,NULL));`
`830`	`833`	`$$ = (Node *) n;`
`831`	`834`	`}`
`832`	`835`	`\|SETSESSIONAUTHORIZATIONColId_or_Sconst`

Comments

(0)