Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit2489c38

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-languageCREATE FUNCTION or DO command executed in a logical replication worker,we'd suffer a null pointer dereference or assertion failure. Thatseems like a rather contrived case, but nonetheless worth fixing.The cause is that function_parse_error_transpose assumes it must beexecuting within the context of a Portal, but logical/worker.cdoesn'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 gracefullyif there's not an ActivePortal. (I have a feeling that the aggressivecheck here was my fault originally, probably because I wasn't sure ifthe 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 LaneDiscussion:https://postgr.es/m/b570c367-ba38-95f3-f62d-5f59b9808226@inbox.ruDiscussion:https://postgr.es/m/adf0452f-8c6b-7def-d35e-ab516c80088e@inbox.ru
1 parenteeb5461 commit2489c38

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
@@ -1012,7 +1012,6 @@ function_parse_error_transpose(const char *prosrc)
10121012
{
10131013
intorigerrposition;
10141014
intnewerrposition;
1015-
constchar*queryText;
10161015

10171016
/*
10181017
* Nothing to do unless we are dealing with a syntax error that has a
@@ -1030,11 +1029,22 @@ function_parse_error_transpose(const char *prosrc)
10301029
}
10311030

10321031
/* We can get the original query text from the active portal (hack...) */
1033-
Assert(ActivePortal&&ActivePortal->status==PORTAL_ACTIVE);
1034-
queryText=ActivePortal->sourceText;
1032+
if (ActivePortal&&ActivePortal->status==PORTAL_ACTIVE)
1033+
{
1034+
constchar*queryText=ActivePortal->sourceText;
10351035

1036-
/* Try to locate the prosrc in the original text */
1037-
newerrposition=match_prosrc_to_query(prosrc,queryText,origerrposition);
1036+
/* Try to locate the prosrc in the original text */
1037+
newerrposition=match_prosrc_to_query(prosrc,queryText,
1038+
origerrposition);
1039+
}
1040+
else
1041+
{
1042+
/*
1043+
* Quietly give up if no ActivePortal. This is an unusual situation
1044+
* but it can happen in, e.g., logical replication workers.
1045+
*/
1046+
newerrposition=-1;
1047+
}
10381048

10391049
if (newerrposition>0)
10401050
{

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp