Fix PL/Python memory leak involving array slices

alvherre · alvherre · commit 1c249fcfcc33 · 2011-03-17T15:26:15.000-03:00
Report and patch from Daniel Popowich, bug #5842
(with some debugging help from Alex Hunsaker)
diff --git a/src/pl/plpython/plpython.c b/src/pl/plpython/plpython.c
@@ -3201,14 +3201,9 @@ PLy_result_ass_item(PyObject *arg, Py_ssize_t idx, PyObject *item)
 static PyObject *
 PLy_result_slice(PyObject *arg, Py_ssize_t lidx, Py_ssize_t hidx)
 {
-	PyObject   *rv;
 	PLyResultObject *ob = (PLyResultObject *) arg;
 
-	rv = PyList_GetSlice(ob->rows, lidx, hidx);
-	if (rv == NULL)
-		return NULL;
-	Py_INCREF(rv);
-	return rv;
+	return PyList_GetSlice(ob->rows, lidx, hidx);
 }
 
 static int

Original file line number	Diff line number	Diff line change
`@@ -3201,14 +3201,9 @@ PLy_result_ass_item(PyObject arg, Py_ssize_t idx, PyObject item)`
`3201`	`3201`	`static PyObject *`
`3202`	`3202`	`PLy_result_slice(PyObject *arg, Py_ssize_t lidx, Py_ssize_t hidx)`
`3203`	`3203`	`{`
`3204`		`- PyObject *rv;`
`3205`	`3204`	`PLyResultObject ob = (PLyResultObject ) arg;`
`3206`	`3205`
`3207`		`- rv = PyList_GetSlice(ob->rows, lidx, hidx);`
`3208`		`- if (rv == NULL)`
`3209`		`- return NULL;`
`3210`		`- Py_INCREF(rv);`
`3211`		`- return rv;`
	`3206`	`+ return PyList_GetSlice(ob->rows, lidx, hidx);`
`3212`	`3207`	`}`
`3213`	`3208`
`3214`	`3209`	`static int`