diff options
| author | Tom Lane | 2010-04-30 19:16:27 +0000 |
|---|---|---|
| committer | Tom Lane | 2010-04-30 19:16:27 +0000 |
| commit | 25681e0a19c4df969c125a21e998253115535433 (patch) | |
| tree | bd076452df6de167cfd747fe9399eba770d78cd2 | |
| parent | f9f0683593c190481e5aa692cf2e58d2bed12cf7 (diff) | |
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.
| -rw-r--r-- | src/pl/plpython/plpython.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/pl/plpython/plpython.c b/src/pl/plpython/plpython.c index f765a685cae..93548520292 100644 --- a/src/pl/plpython/plpython.c +++ b/src/pl/plpython/plpython.c @@ -29,7 +29,7 @@ * MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/pl/plpython/plpython.c,v 1.41.2.4 2007/11/23 01:48:08 alvherre Exp $ + * $Header: /cvsroot/pgsql/src/pl/plpython/plpython.c,v 1.41.2.5 2010/04/30 19:16:27 tgl Exp $ * ********************************************************************* */ @@ -2283,9 +2283,9 @@ PLy_spi_execute_fetch_result(SPITupleTable *tuptable, int rows, int status) PLyTypeInfo args; int i; - PLy_typeinfo_init(&args); Py_DECREF(result->nrows); result->nrows = PyInt_FromLong(rows); + PLy_typeinfo_init(&args); SAVE_EXC(); if (TRAP_EXC()) @@ -2295,8 +2295,9 @@ 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); RERAISE_EXC(); } @@ -2313,11 +2314,11 @@ PLy_spi_execute_fetch_result(SPITupleTable *tuptable, int rows, int status) PyList_SetItem(result->rows, i, row); } - PLy_typeinfo_dealloc(&args); - - SPI_freetuptable(tuptable); } RESTORE_EXC(); + + PLy_typeinfo_dealloc(&args); + SPI_freetuptable(tuptable); } return (PyObject *) result; |