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

Commit9cf1632

Browse files
committed
Fix plancache refcount leak after error in ExecuteQuery.
When stuffing a plan from the plancache into a Portal, one isnot supposed to risk throwing an error between GetCachedPlan andPortalDefineQuery; if that happens, the plan refcount incrementedby GetCachedPlan will be leaked. I managed to break this rulewhile refactoring code in9dbf2b7. There is no visibleconsequence other than some memory leakage, and since nobody isvery likely to trigger the relevant error conditions many timesin a row, it's not surprising we haven't noticed. Nonetheless,it's a bug, so rearrange the order of operations to remove thehazard.Noted on the way to looking for a better fix for bug #17053.This mistake is pretty old, so back-patch to all supportedbranches.
1 parentc0a7587 commit9cf1632

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

‎src/backend/commands/prepare.c

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,17 @@ ExecuteQuery(ExecuteStmt *stmt, IntoClause *intoClause,
246246
cplan=GetCachedPlan(entry->plansource,paramLI, false,NULL);
247247
plan_list=cplan->stmt_list;
248248

249+
/*
250+
* DO NOT add any logic that could possibly throw an error between
251+
* GetCachedPlan and PortalDefineQuery, or you'll leak the plan refcount.
252+
*/
253+
PortalDefineQuery(portal,
254+
NULL,
255+
query_string,
256+
entry->plansource->commandTag,
257+
plan_list,
258+
cplan);
259+
249260
/*
250261
* For CREATE TABLE ... AS EXECUTE, we must verify that the prepared
251262
* statement is one that produces tuples. Currently we insist that it be
@@ -289,13 +300,6 @@ ExecuteQuery(ExecuteStmt *stmt, IntoClause *intoClause,
289300
count=FETCH_ALL;
290301
}
291302

292-
PortalDefineQuery(portal,
293-
NULL,
294-
query_string,
295-
entry->plansource->commandTag,
296-
plan_list,
297-
cplan);
298-
299303
/*
300304
* Run the portal as appropriate.
301305
*/

0 commit comments

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