mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't crash on empty statements in SQL-standard function bodies.

Browse Source 
gram.y should discard NULL pointers (empty statements) when
assembling a routine_body_stmt_list, as it does for other
sorts of statement lists.

Julien Rouhaud and Tom Lane, per report from Noah Misch.

Discussion: https://postgr.es/m/20210606044418.GA297923@rfd.leadboat.com
This commit is contained in:
Tom Lane 2021-06-08 11:59:34 -04:00
parent 37e1cce4dd
commit bfeede9fa4
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/parser/gram.y
View File

@ -7990,7 +7990,11 @@ opt_routine_body:
routine_body_stmt_list: routine_body_stmt_list:
routine_body_stmt_list routine_body_stmt ';' routine_body_stmt_list routine_body_stmt ';'
{ {
/* As in stmtmulti, discard empty statements */
if ($2 != NULL)
$$ = lappend($1, $2); $$ = lappend($1, $2);
else
$$ = $1;
} }
| /*EMPTY*/ | /*EMPTY*/
{ {

2
src/test/regress/expected/create_function_3.out
View File

@ -267,7 +267,7 @@ CREATE FUNCTION functest_S_3() RETURNS boolean
RETURN false; RETURN false;
CREATE FUNCTION functest_S_3a() RETURNS boolean CREATE FUNCTION functest_S_3a() RETURNS boolean
BEGIN ATOMIC BEGIN ATOMIC
RETURN false; ;;RETURN false;;
END; END;
CREATE FUNCTION functest_S_10(a text, b date) RETURNS boolean CREATE FUNCTION functest_S_10(a text, b date) RETURNS boolean
LANGUAGE SQL LANGUAGE SQL

2
src/test/regress/sql/create_function_3.sql
View File

@ -165,7 +165,7 @@ CREATE FUNCTION functest_S_3() RETURNS boolean
RETURN false; RETURN false;
CREATE FUNCTION functest_S_3a() RETURNS boolean CREATE FUNCTION functest_S_3a() RETURNS boolean
BEGIN ATOMIC BEGIN ATOMIC
RETURN false; ;;RETURN false;;
END; END;
CREATE FUNCTION functest_S_10(a text, b date) RETURNS boolean CREATE FUNCTION functest_S_10(a text, b date) RETURNS boolean