diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2021-06-08 11:59:34 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2021-06-08 11:59:34 -0400 |
| commit | bfeede9fa464ab707eb5ac5704742bf78bd7ac9e (patch) | |
| tree | 798ad3820075befedd16ca0b6725fcb06e2f9de4 /src/backend/parser | |
| parent | 37e1cce4ddf0be362e3093cee55493aee41bc423 (diff) | |
| download | postgresql-bfeede9fa464ab707eb5ac5704742bf78bd7ac9e.tar.gz postgresql-bfeede9fa464ab707eb5ac5704742bf78bd7ac9e.zip | |
Don't crash on empty statements in SQL-standard function bodies.
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
Diffstat (limited to 'src/backend/parser')
| -rw-r--r-- | src/backend/parser/gram.y | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index 9ee90e3f13a..52a254928f8 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -7990,7 +7990,11 @@ opt_routine_body: routine_body_stmt_list: routine_body_stmt_list routine_body_stmt ';' { - $$ = lappend($1, $2); + /* As in stmtmulti, discard empty statements */ + if ($2 != NULL) + $$ = lappend($1, $2); + else + $$ = $1; } | /*EMPTY*/ { |