diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2018-05-02 16:50:03 -0400 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2018-05-03 08:39:15 -0400 |
| commit | 30c66e77be1d890c3cca766259c0bec80bcac1b5 (patch) | |
| tree | a4b27230b6a9412e58786d483220cd02b9c9bca7 /src/backend/tcop/postgres.c | |
| parent | a365f52d58317e3b24e06564e1f6474ffa3221d4 (diff) | |
| download | postgresql-30c66e77be1d890c3cca766259c0bec80bcac1b5.tar.gz postgresql-30c66e77be1d890c3cca766259c0bec80bcac1b5.zip | |
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.
Diffstat (limited to 'src/backend/tcop/postgres.c')
| -rw-r--r-- | src/backend/tcop/postgres.c | 2 |
1 files changed, 2 insertions, 0 deletions
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 |