Commit4ecd197

committed

Check that result tupdesc has exactly 1 column in return_next scalar case.

This should always be true, but since we're relying on a tuple descriptorpassed from outside pltcl itself, let's check. Per a gripe from Coverity.

1 parentb40b4dd commit4ecd197Copy full SHA for 4ecd197

File tree

-0

lines changed

-0

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2192,6 +2192,10 @@ pltcl_returnnext(ClientData cdata, Tcl_Interp *interp,`
`2192`	`2192`	`Datumretval;`
`2193`	`2193`	`boolisNull= false;`
`2194`	`2194`
	`2195`	`+/* for paranoia's sake, check that tupdesc has exactly one column */`
	`2196`	`+if (call_state->ret_tupdesc->natts!=1)`
	`2197`	`+elog(ERROR,"wrong result type supplied in return_next");`
	`2198`	`+`
`2195`	`2199`	`retval=InputFunctionCall(&prodesc->result_in_func,`
`2196`	`2200`	`utf_u2e((char*)Tcl_GetString(objv[1])),`
`2197`	`2201`	`prodesc->result_typioparam,`

Comments

(0)