database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-27 22:56:53 +03:00
Code

Fix three Python reference leaks in PLy_traceback(). This would result

Browse Source 
in leaking memory when invoking a PL/Python procedure that raises an
exception. Unfortunately this still leaks memory, but at least the
largest leak has been plugged.

This patch also fixes a reference counting mistake in PLy_modify_tuple()
for 8.0, 8.1 and HEAD: we don't actually own a reference to `platt', so
we shouldn't Py_DECREF() it.
This commit is contained in:
Neil Conway 2006-02-20 20:10:48 +00:00
parent 0c853662bd
commit 11b3472672
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/pl/plpython/plpython.c
View File

@ -29,7 +29,7 @@
* MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. * MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/pl/plpython/plpython.c,v 1.26.2.6 2003/09/17 18:40:11 tgl Exp $ * $Header: /cvsroot/pgsql/src/pl/plpython/plpython.c,v 1.26.2.7 2006/02/20 20:10:48 neilc Exp $
* *
********************************************************************* *********************************************************************
*/ */
@ -1131,7 +1131,7 @@ PLy_procedure_create(FunctionCallInfo fcinfo, bool is_trigger,
} }
/* /*
* now get information required for input conversion of the procedures * now get information required for input conversion of the procedure's
* arguments. * arguments.
*/ */
proc->nargs = fcinfo->nargs; proc->nargs = fcinfo->nargs;
@ -2855,6 +2855,7 @@ PLy_traceback(int *xlevel)
} }
PyErr_NormalizeException(&e, &v, &tb); PyErr_NormalizeException(&e, &v, &tb);
Py_XDECREF(tb);
eob = PyObject_Str(e); eob = PyObject_Str(e);
if ((v) && ((vob = PyObject_Str(v)) != NULL)) if ((v) && ((vob = PyObject_Str(v)) != NULL))
@ -2867,9 +2868,10 @@ PLy_traceback(int *xlevel)
Py_DECREF(eob); Py_DECREF(eob);
Py_XDECREF(vob); Py_XDECREF(vob);
Py_XDECREF(v);
/* /*
* intuit an appropriate error level for based on the exception type * intuit an appropriate error level based on the exception type
*/ */
if ((PLy_exc_error) && (PyErr_GivenExceptionMatches(e, PLy_exc_error))) if ((PLy_exc_error) && (PyErr_GivenExceptionMatches(e, PLy_exc_error)))
*xlevel = ERROR; *xlevel = ERROR;
@ -2878,6 +2880,7 @@ PLy_traceback(int *xlevel)
else else
*xlevel = ERROR; *xlevel = ERROR;
Py_DECREF(e);
leave(); leave();
return xstr; return xstr;