mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-21 08:29:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix portalmem.c to avoid keeping a dangling pointer to a cached plan list

Browse Source 
after it's released its reference count for the cached plan.  There are
code paths that might try to examine the plan list before noticing that
the portal is already in aborted state.  Report and diagnosis by Tatsuo
Ishii, though this isn't exactly his proposed patch.
This commit is contained in:
Tom Lane 2010-01-18 02:30:25 +00:00
parent 04ef404018
commit 376c6203cc
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/backend/utils/mmgr/portalmem.c
View File

@ -12,7 +12,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/mmgr/portalmem.c,v 1.115 2010/01/02 16:57:58 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/mmgr/portalmem.c,v 1.116 2010/01/18 02:30:25 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -328,6 +328,13 @@ PortalReleaseCachedPlan(Portal portal)
{ {
ReleaseCachedPlan(portal->cplan, false); ReleaseCachedPlan(portal->cplan, false);
portal->cplan = NULL; portal->cplan = NULL;
/*
* We must also clear portal->stmts which is now a dangling
* reference to the cached plan's plan list. This protects any
* code that might try to examine the Portal later.
*/
portal->stmts = NIL;
} }
} }
@ -395,8 +402,7 @@ PortalDrop(Portal portal, bool isTopCommit)
(*portal->cleanup) (portal); (*portal->cleanup) (portal);
/* drop cached plan reference, if any */ /* drop cached plan reference, if any */
if (portal->cplan) PortalReleaseCachedPlan(portal);
PortalReleaseCachedPlan(portal);
/* /*
* Release any resources still attached to the portal. There are several * Release any resources still attached to the portal. There are several
@ -529,8 +535,7 @@ CommitHoldablePortals(void)
PersistHoldablePortal(portal); PersistHoldablePortal(portal);
/* drop cached plan reference, if any */ /* drop cached plan reference, if any */
if (portal->cplan) PortalReleaseCachedPlan(portal);
PortalReleaseCachedPlan(portal);
/* /*
* Any resources belonging to the portal will be released in the * Any resources belonging to the portal will be released in the
@ -680,8 +685,7 @@ AtAbort_Portals(void)
} }
/* drop cached plan reference, if any */ /* drop cached plan reference, if any */
if (portal->cplan) PortalReleaseCachedPlan(portal);
PortalReleaseCachedPlan(portal);
/* /*
* Any resources belonging to the portal will be released in the * Any resources belonging to the portal will be released in the
@ -823,8 +827,7 @@ AtSubAbort_Portals(SubTransactionId mySubid,
} }
/* drop cached plan reference, if any */ /* drop cached plan reference, if any */
if (portal->cplan) PortalReleaseCachedPlan(portal);
PortalReleaseCachedPlan(portal);
/* /*
* Any resources belonging to the portal will be released in the * Any resources belonging to the portal will be released in the