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

petere · petere · commit 62546b4357f2 · 2017-11-28T13:55:39.000-05:00
This reverts commit e42e2f3. 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
@@ -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
 				{

Original file line number	Diff line number	Diff line change
`@@ -361,10 +361,7 @@ PLy_spi_execute_fetch_result(SPITupleTable *tuptable, uint64 rows, int status)`
`361`	`361`
`362`	`362`	`result = (PLyResultObject *) PLy_result_new();`
`363`	`363`	`if (!result)`
`364`		`- {`
`365`		`- SPI_freetuptable(tuptable);`
`366`	`364`	`return NULL;`
`367`		`- }`
`368`	`365`	`Py_DECREF(result->status);`
`369`	`366`	`result->status = PyInt_FromLong(status);`
`370`	`367`
`@@ -417,9 +414,7 @@ PLy_spi_execute_fetch_result(SPITupleTable *tuptable, uint64 rows, int status)`
`417`	`414`	`if (!result->rows)`
`418`	`415`	`{`
`419`	`416`	`Py_DECREF(result);`
`420`		`- MemoryContextDelete(cxt);`
`421`		`- SPI_freetuptable(tuptable);`
`422`		`- return NULL;`
	`417`	`+ result = NULL;`
`423`	`418`	`}`
`424`	`419`	`else`
`425`	`420`	`{`