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

tglsfdc · tglsfdc · commit 566480acbbd3 · 2006-12-08T00:40:27.000Z
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
@@ -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 @@ _SPI_execute_plan(_SPI_plan *plan, Datum *Values, const char *Nulls,
 	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);
 }

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/executor/spi.c,v 1.165 2006/11/21 22:35:29 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/executor/spi.c,v 1.166 2006/12/08 00:40:27 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -1543,6 +1543,9 @@ _SPI_execute_plan(_SPI_plan plan, Datum Values, const char *Nulls,`
`1543`	`1543`	`SPI_lastoid = my_lastoid;`
`1544`	`1544`	`SPI_tuptable = my_tuptable;`
`1545`	`1545`
	`1546`	`+ /* tuptable now is caller's responsibility, not SPI's */`
	`1547`	`+ _SPI_current->tuptable = NULL;`
	`1548`	`+`
`1546`	`1549`	`return my_res;`
`1547`	`1550`	`}`
`1548`	`1551`
`@@ -1695,6 +1698,9 @@ _SPI_cursor_operation(Portal portal, bool forward, long count,`
`1695`	`1698`	`SPI_processed = _SPI_current->processed;`
`1696`	`1699`	`SPI_tuptable = _SPI_current->tuptable;`
`1697`	`1700`
	`1701`	`+ /* tuptable now is caller's responsibility, not SPI's */`
	`1702`	`+ _SPI_current->tuptable = NULL;`
	`1703`	`+`
`1698`	`1704`	`/* Pop the SPI stack */`
`1699`	`1705`	`_SPI_end_call(true);`
`1700`	`1706`	`}`