From 566480acbbd37a6a7cb35ae46135e864ac8871a7 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Fri, 8 Dec 2006 00:40:27 +0000 Subject: [PATCH] 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. --- src/backend/executor/spi.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c index d4fa794bc3..90336e4be2 100644 --- a/src/backend/executor/spi.c +++ b/src/backend/executor/spi.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/spi.c,v 1.165 2006/11/21 22:35:29 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/executor/spi.c,v 1.166 2006/12/08 00:40:27 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -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); } -- 2.40.0