1
0
mirror of https://github.com/postgres/postgres.git synced 2025-05-03 22:24:49 +03:00

Remove inappropriate memory context switch in shutdown_MultiFuncCall().

This was a thinko introduced in a patch from last February; it results
in memory leakage if an SRF is shut down before the actual end of query,
because subsequent code will be running in a longer-lived context than
it's expecting to be.
This commit is contained in:
Tom Lane 2008-11-30 18:49:42 +00:00
parent b9e8986d1b
commit 37e4c7219b

View File

@ -7,7 +7,7 @@
* Copyright (c) 2002-2008, PostgreSQL Global Development Group * Copyright (c) 2002-2008, PostgreSQL Global Development Group
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/fmgr/funcapi.c,v 1.37.2.1 2008/02/29 02:49:43 neilc Exp $ * $PostgreSQL: pgsql/src/backend/utils/fmgr/funcapi.c,v 1.37.2.2 2008/11/30 18:49:42 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -182,7 +182,6 @@ shutdown_MultiFuncCall(Datum arg)
* Delete context that holds all multi-call data, including the * Delete context that holds all multi-call data, including the
* FuncCallContext itself * FuncCallContext itself
*/ */
MemoryContextSwitchTo(flinfo->fn_mcxt);
MemoryContextDelete(funcctx->multi_call_memory_ctx); MemoryContextDelete(funcctx->multi_call_memory_ctx);
} }