Ensure that ExecPrepareExprList's result is all in one memory context.

tglsfdc · tglsfdc · commit dbb2a931478a · 2017-04-07T12:54:23.000-04:00
Noted by Amit Langote. Discussion: https://postgr.es/m/aad31672-4983-d95d-d24e-6b42fee9b985@lab.ntt.co.jp
diff --git a/src/backend/executor/execExpr.c b/src/backend/executor/execExpr.c
@@ -511,15 +511,21 @@ List *
 ExecPrepareExprList(List *nodes, EState *estate)
 {
 	List	   *result = NIL;
+	MemoryContext oldcontext;
 	ListCell   *lc;
 
+	/* Ensure that the list cell nodes are in the right context too */
+	oldcontext = MemoryContextSwitchTo(estate->es_query_cxt);
+
 	foreach(lc, nodes)
 	{
 		Expr	   *e = (Expr *) lfirst(lc);
 
 		result = lappend(result, ExecPrepareExpr(e, estate));
 	}
 
+	MemoryContextSwitchTo(oldcontext);
+
 	return result;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -511,15 +511,21 @@ List *`
`511`	`511`	`ExecPrepareExprList(List nodes, EState estate)`
`512`	`512`	`{`
`513`	`513`	`List *result = NIL;`
	`514`	`+ MemoryContext oldcontext;`
`514`	`515`	`ListCell *lc;`
`515`	`516`
	`517`	`+ /* Ensure that the list cell nodes are in the right context too */`
	`518`	`+ oldcontext = MemoryContextSwitchTo(estate->es_query_cxt);`
	`519`	`+`
`516`	`520`	`foreach(lc, nodes)`
`517`	`521`	`{`
`518`	`522`	`Expr e = (Expr ) lfirst(lc);`
`519`	`523`
`520`	`524`	`result = lappend(result, ExecPrepareExpr(e, estate));`
`521`	`525`	`}`
`522`	`526`
	`527`	`+ MemoryContextSwitchTo(oldcontext);`
	`528`	`+`
`523`	`529`	`return result;`
`524`	`530`	`}`
`525`	`531`