From 30c66e77be1d890c3cca766259c0bec80bcac1b5 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Wed, 2 May 2018 16:50:03 -0400 Subject: Fix SPI error cleanup and memory leak Since the SPI stack has been moved from TopTransactionContext to TopMemoryContext, setting _SPI_stack to NULL in AtEOXact_SPI() leaks memory. In fact, we don't need to do that anymore: We just leave the allocated stack around for the next SPI use. Also, refactor the SPI cleanup so that it is run both at transaction end and when returning to the main loop on an exception. The latter is necessary when a procedure calls a COMMIT or ROLLBACK command that itself causes an error. --- src/backend/tcop/postgres.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/backend/tcop/postgres.c') diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 3828cae921d..f4133953beb 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -42,6 +42,7 @@ #include "catalog/pg_type.h" #include "commands/async.h" #include "commands/prepare.h" +#include "executor/spi.h" #include "jit/jit.h" #include "libpq/libpq.h" #include "libpq/pqformat.h" @@ -3941,6 +3942,7 @@ PostgresMain(int argc, char *argv[], WalSndErrorCleanup(); PortalErrorCleanup(); + SPICleanup(); /* * We can't release replication slots inside AbortTransaction() as we -- cgit v1.2.3