Commit113a659

committed

Ensure that PLPGSQL_DTYPE_ROW variables have valid refname fields.

Without this, the syntax-tree-dumping functions in pl_funcs.c crash,and there are other places that might be at risk too. Per reportfrom Pavel Stehule.Looks like I broke this in commitf926300, so back-patch to v11.Discussion:https://postgr.es/m/CAFj8pRA+3f5n4642q2g8BXCKjbTd7yU9JMYAgDyHgozk6cQ-VA@mail.gmail.com

1 parentb5f03dc commit113a659Copy full SHA for 113a659

File tree

+12

-1

lines changed

+12

-1

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1896,6 +1896,8 @@ build_row_from_vars(PLpgSQL_variable **vars, int numvars)`
`1896`	`1896`
`1897`	`1897`	`row=palloc0(sizeof(PLpgSQL_row));`
`1898`	`1898`	`row->dtype=PLPGSQL_DTYPE_ROW;`
	`1899`	`+row->refname="(unnamed row)";`
	`1900`	`+row->lineno=-1;`
`1899`	`1901`	`row->rowtupdesc=CreateTemplateTupleDesc(numvars, false);`
`1900`	`1902`	`row->nfields=numvars;`
`1901`	`1903`	`row->fieldnames=palloc(numvarssizeof(char));`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2205,6 +2205,7 @@ exec_stmt_call(PLpgSQL_execstate estate, PLpgSQL_stmt_call stmt)`
`2205`	`2205`
`2206`	`2206`	`row=palloc0(sizeof(*row));`
`2207`	`2207`	`row->dtype=PLPGSQL_DTYPE_ROW;`
	`2208`	`+row->refname="(unnamed row)";`
`2208`	`2209`	`row->lineno=-1;`
`2209`	`2210`	`row->varnos=palloc(sizeof(int)*FUNC_MAX_ARGS);`
`2210`	`2211`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -613,6 +613,7 @@ decl_cursor_args :`
`613`	`613`
`614`	`614`	`new = palloc0(sizeof(PLpgSQL_row));`
`615`	`615`	`new->dtype = PLPGSQL_DTYPE_ROW;`
	`616`	`+new->refname ="(unnamed row)";`
`616`	`617`	`new->lineno = plpgsql_location_to_lineno(@1);`
`617`	`618`	`new->rowtupdesc =NULL;`
`618`	`619`	`new->nfields = list_length($2);`
`@@ -3526,6 +3527,7 @@ read_into_scalar_list(char *initial_name,`
`3526`	`3527`
`3527`	`3528`	`row = palloc0(sizeof(PLpgSQL_row));`
`3528`	`3529`	`row->dtype = PLPGSQL_DTYPE_ROW;`
	`3530`	`+row->refname = "(unnamed row)";`
`3529`	`3531`	`row->lineno = plpgsql_location_to_lineno(initial_location);`
`3530`	`3532`	`row->rowtupdesc = NULL;`
`3531`	`3533`	`row->nfields = nfields;`
`@@ -3560,6 +3562,7 @@ make_scalar_list1(char *initial_name,`
`3560`	`3562`
`3561`	`3563`	`row = palloc0(sizeof(PLpgSQL_row));`
`3562`	`3564`	`row->dtype = PLPGSQL_DTYPE_ROW;`
	`3565`	`+row->refname = "(unnamed row)";`
`3563`	`3566`	`row->lineno = lineno;`
`3564`	`3567`	`row->rowtupdesc = NULL;`
`3565`	`3568`	`row->nfields = 1;`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -326,7 +326,12 @@ typedef struct PLpgSQL_var`
`326`	`326`	`* Note that there's no way to name the row as such from PL/pgSQL code,`
`327`	`327`	`* so many functions don't need to support these.`
`328`	`328`	`*`
`329`		`- * refname, isconst, notnull, and default_val are unsupported (and hence`
	`329`	`+ * That also means that there's no real name for the row variable, so we`
	`330`	`+ * conventionally set refname to "(unnamed row)". We could leave it NULL,`
	`331`	`+ * but it's too convenient to be able to assume that refname is valid in`
	`332`	`+ * all variants of PLpgSQL_variable.`
	`333`	`+ *`
	`334`	`+ * isconst, notnull, and default_val are unsupported (and hence`
`330`	`335`	`* always zero/null) for a row. The member variables of a row should have`
`331`	`336`	`* been checked to be writable at compile time, so isconst is correctly set`
`332`	`337`	`* to false. notnull and default_val aren't applicable.`

Comments

(0)