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 9e28ffe03aa3fd3d31a675c1a9fd8b190a594241..1a8c2ef857afa43ce51df9a74343a0fad5c070f5 100644 (file)
--- a/src/pl/plpython/plpython.c
+++ b/src/pl/plpython/plpython.c
@@ -29,7 +29,7 @@
  * MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
  *
  * IDENTIFICATION
- *     $PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.66.2.8 2010/02/18 23:50:33 tgl Exp $
+ *     $PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.66.2.9 2010/04/30 19:16:10 tgl Exp $
  *
  *********************************************************************
  */
@@ -2228,9 +2228,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();
@@ -2241,11 +2238,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;