postgres.git / summary / log / commit / refs

commit    80dc8a8fa343fc54bc2fe945b215bebdb287e342
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Fri Apr 30 19:15:58 2010 +0000
First released in: 9.0.0, 7.4.29, 8.0.25, 8.1.21, 8.2.17, 8.3.11, 8.4.4

    Fix multiple memory leaks in PLy_spi_execute_fetch_result: it would leak
    memory if the result had zero rows, and also if there was any sort of error
    while converting the result tuples into Python data.  Reported and partially
    fixed by Andres Freund.
    
    Back-patch to all supported versions.  Note: I haven't tested the 7.4 fix.
    7.4's configure check for python is so obsolete it doesn't work on my
    current machines :-(.  The logic change is pretty straightforward though.


 src/pl/plpython/plpython.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/pl/plpython/plpython.c b/src/pl/plpython/plpython.c
index aa6ac71cb1e..3d422eb7e8a 100644
--- a/src/pl/plpython/plpython.c
+++ b/src/pl/plpython/plpython.c
@@ -1,7 +1,7 @@
 /**********************************************************************
  * plpython.c - python as a procedural language for PostgreSQL
  *
- *	$PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.106.2.2 2010/02/18 23:50:20 tgl Exp $
+ *	$PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.106.2.3 2010/04/30 19:15:58 tgl Exp $
  *
  *********************************************************************
  */
@@ -2678,9 +2678,6 @@ PLy_spi_execute_fetch_result(SPITupleTable *tuptable, int rows, int status)
 
 					PyList_SetItem(result->rows, i, row);
 				}
-				PLy_typeinfo_dealloc(&args);
-
-				SPI_freetuptable(tuptable);
 			}
 		}
 		PG_CATCH();
@@ -2691,11 +2688,15 @@ PLy_spi_execute_fetch_result(SPITupleTable *tuptable, int rows, int status)
 			if (!PyErr_Occurred())
 				PyErr_SetString(PLy_exc_error,
 							"Unknown error in PLy_spi_execute_fetch_result");
-			Py_DECREF(result);
 			PLy_typeinfo_dealloc(&args);
+			SPI_freetuptable(tuptable);
+			Py_DECREF(result);
 			return NULL;
 		}
 		PG_END_TRY();
+
+		PLy_typeinfo_dealloc(&args);
+		SPI_freetuptable(tuptable);
 	}
 
 	return (PyObject *) result;


[parent: 750503cea566]