From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Tue, 23 Sep 2003 15:11:41 +0000 (+0000)
Subject: _SPI_cursor_operation forgot to check for failure return from
X-Git-Url: http://waps.l3s.uni-hannover.de/gitweb/?a=commitdiff_plain;h=97872cdb54984fe34e84506c214cfd3ed2c7c0da;p=users%2Fbernd%2Fpostgres.git

_SPI_cursor_operation forgot to check for failure return from
_SPI_begin_call.  Per gripe from Tomasz Myrta.
---

diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c
index 0a17c727e9..135a848aa9 100644
--- a/src/backend/executor/spi.c
+++ b/src/backend/executor/spi.c
@@ -1270,7 +1270,8 @@ _SPI_cursor_operation(Portal portal, bool forward, int count,
 		elog(ERROR, "invalid portal in SPI cursor operation");
 
 	/* Push the SPI stack */
-	_SPI_begin_call(true);
+	if (_SPI_begin_call(true) < 0)
+		elog(ERROR, "SPI cursor operation called while not connected");
 
 	/* Reset the SPI result */
 	SPI_processed = 0;
@@ -1320,8 +1321,7 @@ _SPI_procmem()
 }
 
 /*
- * _SPI_begin_call
- *
+ * _SPI_begin_call: begin a SPI operation within a connected procedure
  */
 static int
 _SPI_begin_call(bool execmem)
@@ -1338,6 +1338,11 @@ _SPI_begin_call(bool execmem)
 	return 0;
 }
 
+/*
+ * _SPI_end_call: end a SPI operation within a connected procedure
+ *
+ * Note: this currently has no failure return cases, so callers don't check
+ */
 static int
 _SPI_end_call(bool procmem)
 {