From: Peter Eisentraut <peter_e@gmx.net>
Date: Tue, 28 Nov 2017 18:55:39 +0000 (-0500)
Subject: Revert "PL/Python: Fix potential NULL pointer dereference"
X-Git-Tag: REL_11_BETA1~1150
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=62546b4357f2aec46bb896fdbddfc0904a2d7920;p=postgresql

Revert "PL/Python: Fix potential NULL pointer dereference"

This reverts commit e42e2f38907681c48c43f49c5ec9f9f41a9aa9a5.

It's not safe to return in the middle of a PG_TRY block, so this will
have to be done differently.
---

diff --git a/src/pl/plpython/plpy_spi.c b/src/pl/plpython/plpy_spi.c
index c80ccf6129..ade27f3924 100644
--- a/src/pl/plpython/plpy_spi.c
+++ b/src/pl/plpython/plpy_spi.c
@@ -361,10 +361,7 @@ PLy_spi_execute_fetch_result(SPITupleTable *tuptable, uint64 rows, int status)
 
 	result = (PLyResultObject *) PLy_result_new();
 	if (!result)
-	{
-		SPI_freetuptable(tuptable);
 		return NULL;
-	}
 	Py_DECREF(result->status);
 	result->status = PyInt_FromLong(status);
 
@@ -417,9 +414,7 @@ PLy_spi_execute_fetch_result(SPITupleTable *tuptable, uint64 rows, int status)
 				if (!result->rows)
 				{
 					Py_DECREF(result);
-					MemoryContextDelete(cxt);
-					SPI_freetuptable(tuptable);
-					return NULL;
+					result = NULL;
 				}
 				else
 				{