database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-02 09:02:37 +03:00
Code Activity

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

Browse Source 
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.
This commit is contained in:
Tom Lane
2006-12-08 00:40:33 +00:00
parent 373bd34e73
commit 3647ff3b3a
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/executor/spi.c
View File

@ -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.165.2.1 2006/12/08 00:40:33 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);
}