Commit 5567d12c authored by Andres Freund's avatar Andres Freund

Plug leak in BuildTupleHashTable by creating ExprContext in correct context.

In bf6c614a I added a expr context to evaluate the grouping
expression. Unfortunately the code I added initialized them while in
the calling context, rather the table context.  Additionally, I used
CreateExprContext() rather than CreateStandaloneExprContext(), which
creates the econtext in the estate's query context.

Fix that by using CreateStandaloneExprContext when in the table's
tablecxt. As we rely on the memory being freed by a memory context
reset that means that the econtext's shutdown callbacks aren't being
called, but that seems ok as the expressions are tightly controlled
due to ExecBuildGroupingEqual().

Bug: #15592
Reported-By: Dmitry Marakasov
Author: Andres Freund
Discussion: https://postgr.es/m/20190114222838.h6r3fuyxjxkykf6t@alap3.anarazel.de
Backpatch: 11, where I broke this in bf6c614a
parent 0edef16d
...@@ -212,11 +212,17 @@ BuildTupleHashTable(PlanState *parent, ...@@ -212,11 +212,17 @@ BuildTupleHashTable(PlanState *parent,
&TTSOpsMinimalTuple, &TTSOpsMinimalTuple, &TTSOpsMinimalTuple, &TTSOpsMinimalTuple,
numCols, numCols,
keyColIdx, eqfuncoids, keyColIdx, eqfuncoids,
parent); NULL);
MemoryContextSwitchTo(oldcontext); /*
* While not pretty, it's ok to not shut down this context, but instead
* rely on the containing memory context being reset, as
* ExecBuildGroupingEqual() only builds a very simple expression calling
* functions (i.e. nothing that'd employ RegisterExprContextCallback()).
*/
hashtable->exprcontext = CreateStandaloneExprContext();
hashtable->exprcontext = CreateExprContext(parent->state); MemoryContextSwitchTo(oldcontext);
return hashtable; return hashtable;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment