postgres.git / summary / log / commit / refs

commit    e42e2f38907681c48c43f49c5ec9f9f41a9aa9a5
Author:   Peter Eisentraut <peter_e@gmx.net>
Date:     Tue Nov 28 16:28:05 2017 +0000
First released in: master (reverted before release)
Reverted by: 62546b4357f2 (in 11.0)

    PL/Python: Fix potential NULL pointer dereference
    
    After d0aa965c0a0ac2ff7906ae1b1dad50a7952efa56, one error path in
    PLy_spi_execute_fetch_result() could result in the variable "result"
    being dereferenced after being set to NULL.  To fix that, just clear the
    resources right there and return early.
    
    Also add another SPI_freetuptable() call so that that is cleared in all
    error paths.
    
    discovered by John Naylor <jcnaylor@gmail.com> via scan-build


 src/pl/plpython/plpy_spi.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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


[parent: 7b88d63a9122]