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

Commit 9cf37a5

Browse files
committed
Plug leak in BuildTupleHashTable by creating ExprContext in correct context.
In bf6c614 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 bf6c614
1 parent 5996cfc commit 9cf37a5

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

src/backend/executor/execGrouping.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -208,11 +208,17 @@ BuildTupleHashTable(PlanState *parent,
208208
hashtable->tab_eq_func = ExecBuildGroupingEqual(inputDesc, inputDesc,
209209
numCols,
210210
keyColIdx, eqfuncoids,
211-
parent);
211+
NULL);
212212

213-
MemoryContextSwitchTo(oldcontext);
213+
/*
214+
* While not pretty, it's ok to not shut down this context, but instead
215+
* rely on the containing memory context being reset, as
216+
* ExecBuildGroupingEqual() only builds a very simple expression calling
217+
* functions (i.e. nothing that'd employ RegisterExprContextCallback()).
218+
*/
219+
hashtable->exprcontext = CreateStandaloneExprContext();
214220

215-
hashtable->exprcontext = CreateExprContext(parent->state);
221+
MemoryContextSwitchTo(oldcontext);
216222

217223
return hashtable;
218224
}

0 commit comments

Comments
 (0)