]> git.ipfire.org Git - thirdparty/postgresql.git/commitdiff
Remove inappropriate memory context switch in shutdown_MultiFuncCall().
authorTom Lane <tgl@sss.pgh.pa.us>
Sun, 30 Nov 2008 18:49:42 +0000 (18:49 +0000)
committerTom Lane <tgl@sss.pgh.pa.us>
Sun, 30 Nov 2008 18:49:42 +0000 (18:49 +0000)
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.

src/backend/utils/fmgr/funcapi.c

index 96995a4b2aedcf218de3c2a47cabdb211b19c24e..83a0230ab090d2b7c0b3861807fe0d06f3ed765f 100644 (file)
@@ -7,7 +7,7 @@
  * Copyright (c) 2002-2008, PostgreSQL Global Development Group
  *
  * 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
         * FuncCallContext itself
         */
-       MemoryContextSwitchTo(flinfo->fn_mcxt);
        MemoryContextDelete(funcctx->multi_call_memory_ctx);
 }