1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix EXIT out of outermost block in plpgsql.

Browse Source 
Ordinarily, using EXIT this way would draw "control reached end of
function without RETURN".  However, if the function is one where we
don't require an explicit RETURN (such as a DO block), that should
not happen.  It did anyway, because add_dummy_return() neglected to
account for the case.

Per report from Herwig Goemans.  Back-patch to all supported branches.

Discussion: https://postgr.es/m/868ae948-e3ca-c7ec-95a6-83cfc08ef750@gmail.com
This commit is contained in:
Tom Lane 2021-09-13 12:42:04 -04:00
parent 3768c468df
commit a460f7eb3d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pl/plpgsql/src/pl_comp.c
View File

@ -976,9 +976,11 @@ add_dummy_return(PLpgSQL_function *function)
/*
* If the outer block has an EXCEPTION clause, we need to make a new outer
* block, since the added RETURN shouldn't act like it is inside the
* EXCEPTION clause.
* EXCEPTION clause. Likewise, if it has a label, wrap it in a new outer
* block so that EXIT doesn't skip the RETURN.
*/
if (function->action->exceptions != NULL)
if (function->action->exceptions != NULL ||
function->action->label != NULL)
{
PLpgSQL_stmt_block *new;