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 25e4d2653d333e6f11b6d1311220d4f8f0ed5bb1..889c84ab565b905ec39b0871bcfd4af07193c42b 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.122.2.2 2010/02/18 23:50:12 tgl Exp $
+ *     $PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.122.2.3 2010/04/30 19:15:51 tgl Exp $
  *
  *********************************************************************
  */
@@ -2729,9 +2729,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();
@@ -2742,11 +2739,15 @@ PLy_spi_execute_fetch_result(SPITupleTable *tuptable, int rows, int status)
                        if (!PyErr_Occurred())
                                PLy_exception_set(PLy_exc_error,
                                           "unrecognized 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;