Fix PL/Python memory leak involving array slices

alvherre · alvherre · commit 38e5124574ae · 2011-03-17T12:32:46.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
@@ -2772,14 +2772,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
`@@ -2772,14 +2772,9 @@ PLy_result_ass_item(PyObject arg, Py_ssize_t idx, PyObject item)`
`2772`	`2772`	`static PyObject *`
`2773`	`2773`	`PLy_result_slice(PyObject *arg, Py_ssize_t lidx, Py_ssize_t hidx)`
`2774`	`2774`	`{`
`2775`		`- PyObject *rv;`
`2776`	`2775`	`PLyResultObject ob = (PLyResultObject ) arg;`
`2777`	`2776`
`2778`		`- rv = PyList_GetSlice(ob->rows, lidx, hidx);`
`2779`		`- if (rv == NULL)`
`2780`		`- return NULL;`
`2781`		`- Py_INCREF(rv);`
`2782`		`- return rv;`
	`2777`	`+ return PyList_GetSlice(ob->rows, lidx, hidx);`
`2783`	`2778`	`}`
`2784`	`2779`
`2785`	`2780`	`static int`