1 files changed, 9 insertions, 0 deletions
diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c
index 995f67d2662..96370513e80 100644
--- a/src/backend/executor/spi.c
+++ b/src/backend/executor/spi.c
@@ -1175,6 +1175,12 @@ SPI_cursor_open_internal(const char *name, SPIPlanPtr plan,
 	{
 		/* Use a random nonconflicting name */
 		portal = CreateNewPortal();
+
+		/*
+		 * Make sure the portal doesn't get closed by the user statements we
+		 * execute.
+		 */
+		PinPortal(portal);
 	}
 	else
 	{
@@ -1413,6 +1419,9 @@ SPI_cursor_close(Portal portal)
 	if (!PortalIsValid(portal))
 		elog(ERROR, "invalid portal in SPI cursor operation");
 
+	if (portal->portalPinned)
+		UnpinPortal(portal);
+
 	PortalDrop(portal, false);
 }