diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2009-07-18 19:15:42 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2009-07-18 19:15:42 +0000 |
| commit | 011eae60effb07af476255be754ee491ce37164d (patch) | |
| tree | 0658181eaf1b631fd1c09c2bbec19c8220f937b4 /src/backend/executor/nodeIndexscan.c | |
| parent | fb18055998f1f0256f827fe5de77b5d3369a9f21 (diff) | |
| download | postgresql-011eae60effb07af476255be754ee491ce37164d.tar.gz postgresql-011eae60effb07af476255be754ee491ce37164d.zip | |
Fix error cleanup failure caused by 8.4 changes in plpgsql to try to avoid
memory leakage in error recovery. We were calling FreeExprContext, and
therefore invoking ExprContextCallback callbacks, in both normal and error
exits from subtransactions. However this isn't very safe, as shown in
recent trouble report from Frank van Vugt, in which releasing a tupledesc
refcount failed. It's also unnecessary, since the resources that callbacks
might wish to release should be cleaned up by other error recovery mechanisms
(ie the resource owners). We only really want FreeExprContext to release
memory attached to the exprcontext in the error-exit case. So, add a bool
parameter to FreeExprContext to tell it not to call the callbacks.
A more general solution would be to pass the isCommit bool parameter on to
the callbacks, so they could do only safe things during error exit. But
that would make the patch significantly more invasive and possibly break
third-party code that registers ExprContextCallback callbacks. We might want
to do that later in HEAD, but for now I'll just do what seems reasonable to
back-patch.
Diffstat (limited to 'src/backend/executor/nodeIndexscan.c')
| -rw-r--r-- | src/backend/executor/nodeIndexscan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c index d0f1899fca3..48290d14cb5 100644 --- a/src/backend/executor/nodeIndexscan.c +++ b/src/backend/executor/nodeIndexscan.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeIndexscan.c,v 1.132 2009/06/11 14:48:57 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/executor/nodeIndexscan.c,v 1.133 2009/07/18 19:15:41 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -423,7 +423,7 @@ ExecEndIndexScan(IndexScanState *node) #ifdef NOT_USED ExecFreeExprContext(&node->ss.ps); if (node->iss_RuntimeContext) - FreeExprContext(node->iss_RuntimeContext); + FreeExprContext(node->iss_RuntimeContext, true); #endif /* |