Merge pull request #13345 from meeseeksmachine/auto-backport-of-pr-13333-on-v3.0.x

timhoffm · web-flow · commit 6f0b80c603df · 2019-02-02T12:57:04.000+01:00
Backport PR #13333 on branch v3.0.x (Fix possible leak of return of PySequence_GetItem.)
diff --git a/src/_path_wrapper.cpp b/src/_path_wrapper.cpp
@@ -727,6 +727,7 @@ static PyObject *Py_convert_to_string(PyObject *self, PyObject *args, PyObject *
             return NULL;
         }
         codes[i] = PyBytes_AsString(item);
+        Py_DECREF(item);
         if (codes[i] == NULL) {
             return NULL;
         }
diff --git a/src/py_adaptors.h b/src/py_adaptors.h
@@ -240,6 +240,7 @@ class PathGenerator
             throw py::exception();
         }
         if (!convert_path(item, &path)) {
+            Py_DECREF(item);
             throw py::exception();
         }
         Py_DECREF(item);

Original file line number	Diff line number	Diff line change
`@@ -727,6 +727,7 @@ static PyObject Py_convert_to_string(PyObject self, PyObject args, PyObject `
`727`	`727`	`return NULL;`
`728`	`728`	`}`
`729`	`729`	`codes[i] = PyBytes_AsString(item);`
	`730`	`+ Py_DECREF(item);`
`730`	`731`	`if (codes[i] == NULL) {`
`731`	`732`	`return NULL;`
`732`	`733`	`}`