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.

diff --git a/src/pl/plpython/plpython.c b/src/pl/plpython/plpython.c
index 8485aa6311b2b24ebe4006fef1d45e70c3529eb6..58c02001d9afcd3fd67ac78d3710db16fb3f9dba 100644 (file)
--- 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.90.2.6 2010/02/18 23:50:27 tgl Exp $
+ *     $PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.90.2.7 2010/04/30 19:16:04 tgl Exp $
  *
  *********************************************************************
  */
@@ -2652,9 +2652,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();
@@ -2665,11 +2662,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;