Guard against NULL strings in SET key=val constructs.

Thomas G. Lockhart · Thomas G. Lockhart · commit f20509551dd1 · 2002-03-09T17:37:16.000Z
Problem noted by Fernando Nasser.
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.288 2002/03/08 04:37:17 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.289 2002/03/09 17:37:16 thomas Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -790,14 +790,16 @@ VariableSetStmt:  SET ColId TO var_value
 				{
 					VariableSetStmt *n = makeNode(VariableSetStmt);
 					n->name  = $2;
-					n->args = makeList1(makeStringConst($4, NULL));
+					if ($4 != NULL)
+						n->args = makeList1(makeStringConst($4, NULL));
 					$$ = (Node *) n;
 				}
 		| SET ColId '=' var_value
 				{
 					VariableSetStmt *n = makeNode(VariableSetStmt);
 					n->name  = $2;
-					n->args = makeList1(makeStringConst($4, NULL));
+					if ($4 != NULL)
+						n->args = makeList1(makeStringConst($4, NULL));
 					$$ = (Node *) n;
 				}
 		| SET TIME ZONE zone_value
@@ -826,7 +828,8 @@ VariableSetStmt:  SET ColId TO var_value
 				{
 					VariableSetStmt *n = makeNode(VariableSetStmt);
 					n->name  = "client_encoding";
-					n->args = makeList1(makeStringConst($3, NULL));
+					if ($3 != NULL)
+						n->args = makeList1(makeStringConst($3, NULL));
 					$$ = (Node *) n;
 				}
 		| SET SESSION AUTHORIZATION ColId_or_Sconst

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`	`* AUTHOR DATE MAJOR 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`	`\| SET ColId '=' 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`	`\| SET TIME ZONE zone_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`	`\| SET SESSION AUTHORIZATION ColId_or_Sconst`