Avoid double free of _SPI_current->tuptable. AtEOSubXact_SPI() now tries to

release it in a subtransaction abort, but this neglects possibility that
someone outside SPI already did.  Fix is for spi.c to forget about a tuptable
as soon as it's handed it back to the caller.
Per bug #2817 from Michael Andreen.

diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c
index ab7e7937447873ec5f12fa13caf3e5a366da07b5..311eeacd4acee2ecb72cde466c8a847e37b52a04 100644 (file)
--- a/src/backend/executor/spi.c
+++ b/src/backend/executor/spi.c
@@ -1543,6 +1543,9 @@ fail:
        SPI_lastoid = my_lastoid;
        SPI_tuptable = my_tuptable;
 
+       /* tuptable now is caller's responsibility, not SPI's */
+       _SPI_current->tuptable = NULL;
+
        return my_res;
 }
 
@@ -1695,6 +1698,9 @@ _SPI_cursor_operation(Portal portal, bool forward, long count,
        SPI_processed = _SPI_current->processed;
        SPI_tuptable = _SPI_current->tuptable;
 
+       /* tuptable now is caller's responsibility, not SPI's */
+       _SPI_current->tuptable = NULL;
+
        /* Pop the SPI stack */
        _SPI_end_call(true);
 }