Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 5868913

Browse files
committed
Fix ancient memory leak in contrib/auto_explain.
The ExecutorEnd hook is invoked in a context that could be quite long-lived, not the executor's own per-query context as I think we were sort of assuming. Thus, any cruft generated while producing the EXPLAIN output could accumulate over multiple queries. This can result in spectacular leakage if log_nested_statements is on, and even without that I'm surprised nobody complained before. To fix, just switch into the executor's context so that anything we allocate will be released when standard_ExecutorEnd frees the executor state. We might as well nuke the code's retail pfree of the explain output string, too; that's laughably inadequate to the need. Japin Li, per report from Jeff Janes. This bug is old, so back-patch to all supported branches. Discussion: https://postgr.es/m/CAMkU=1wCVtbeRn0s9gt12KwQ7PLXovbpM8eg25SYocKW3BT4hg@mail.gmail.com
1 parent dae5af6 commit 5868913

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

contrib/auto_explain/auto_explain.c

+9-2
Original file line numberDiff line numberDiff line change
@@ -371,8 +371,15 @@ explain_ExecutorEnd(QueryDesc *queryDesc)
371371
{
372372
if (queryDesc->totaltime && auto_explain_enabled())
373373
{
374+
MemoryContext oldcxt;
374375
double msec;
375376

377+
/*
378+
* Make sure we operate in the per-query context, so any cruft will be
379+
* discarded later during ExecutorEnd.
380+
*/
381+
oldcxt = MemoryContextSwitchTo(queryDesc->estate->es_query_cxt);
382+
376383
/*
377384
* Make sure stats accumulation is done. (Note: it's okay if several
378385
* levels of hook all do this.)
@@ -424,9 +431,9 @@ explain_ExecutorEnd(QueryDesc *queryDesc)
424431
(errmsg("duration: %.3f ms plan:\n%s",
425432
msec, es->str->data),
426433
errhidestmt(true)));
427-
428-
pfree(es->str->data);
429434
}
435+
436+
MemoryContextSwitchTo(oldcxt);
430437
}
431438

432439
if (prev_ExecutorEnd)

0 commit comments

Comments
 (0)