1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Peter Eisentraut 2017-11-28 13:55:39 -05:00
parent 445dbd82a3
commit 62546b4357
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pl/plpython/plpy_spi.c
View File

@ -361,10 +361,7 @@ PLy_spi_execute_fetch_result(SPITupleTable *tuptable, uint64 rows, int status)
result = (PLyResultObject *) PLy_result_new(); result = (PLyResultObject *) PLy_result_new();
if (!result) if (!result)
{
SPI_freetuptable(tuptable);
return NULL; return NULL;
}
Py_DECREF(result->status); Py_DECREF(result->status);
result->status = PyInt_FromLong(status); result->status = PyInt_FromLong(status);
@ -417,9 +414,7 @@ PLy_spi_execute_fetch_result(SPITupleTable *tuptable, uint64 rows, int status)
if (!result->rows) if (!result->rows)
{ {
Py_DECREF(result); Py_DECREF(result);
MemoryContextDelete(cxt); result = NULL;
SPI_freetuptable(tuptable);
return NULL;
} }
else else
{ {