8000 Avoid crash after function syntax error in a replication worker. · postgres/postgres@ed019b5 · GitHub
[go: up one dir, main page]

Skip to content

Commit ed019b5

Browse files
committed
Avoid crash after function syntax error in a replication worker.
If a syntax error occurred in a SQL-language or PL/pgSQL-language CREATE FUNCTION or DO command executed in a logical replication worker, we'd suffer a null pointer dereference or assertion failure. That seems like a rather contrived case, but nonetheless worth fixing. The cause is that function_parse_error_transpose assumes it must be executing within the context of a Portal, but logical/worker.c doesn't create a Portal since it's not running the standard executor. We can just back off the hard Assert check and make it fail gracefully if there's not an ActivePortal. (I have a feeling that the aggressive check here was my fault originally, probably because I wasn't sure if the case would always hold and wanted to find out. Well, now we know.) The hazard seems to exist in all branches that have logical replication, so back-patch to v10. Maxim Orlov, Anton Melnikov, Masahiko Sawada, Tom Lane Discussion: https://postgr.es/m/b570c367-ba38-95f3-f62d-5f59b9808226@inbox.ru Discussion: https://postgr.es/m/adf0452f-8c6b-7def-d35e-ab516c80088e@inbox.ru
1 parent a0f9be1 commit ed019b5

File tree

1 file changed

+15
-5
lines changed

1 file changed

+15
-5
lines changed

src/backend/catalog/pg_proc.c

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -967,7 +967,6 @@ function_parse_error_transpose(const char *prosrc)
967967
{
968968
int origerrposition;
969969
int newerrposition;
970-
const char *queryText;
971970

972971
/*
973972
* Nothing to do unless we are dealing with a syntax error that has a
@@ -985,11 +984,22 @@ function_parse_error_transpose(const char *prosrc)
985984
}
986985

987986
/* We can get the original query text from the active portal (hack...) */
988-
Assert(ActivePortal && ActivePortal->status == PORTAL_ACTIVE);
989-
queryText = ActivePortal->sourceText;
987+
if (ActivePortal && ActivePortal->status == PORTAL_ACTIVE)
988+
{
989+
const char *queryText = ActivePortal->sourceText;
990990

991-
/* Try to locate the prosrc in the original text */
992-
newerrposition = match_prosrc_to_query(prosrc, queryText, origerrposition);
991+
/* Try to locate the prosrc in the original text */
992+
newerrposition = match_prosrc_to_query(prosrc, queryText,
993+
origerrposition);
994+
}
995+
else
996+
{
997+
/*
998+
* Quietly give up if no ActivePortal. This is an unusual situation
999+
* but it can happen in, e.g., logical replication workers.
1000+
*/
1001+
newerrposition = -1;
1002+
}
9931003

9941004
if (newerrposition > 0)
9951005
{

0 commit comments

Comments
 (0)
0