Commitd5de944

authored

Merge pull request#20683 from meeseeksmachine/auto-backport-of-pr-20645-on-v3.4.x

Backport PR#20645 on branch v3.4.x (Fix leak if affine_transform is passed invalid vertices.)

2 parentsa518b74 +cce1048 commitd5de944Copy full SHA for d5de944

File tree

-2

lines changed

-2

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -471,17 +471,19 @@ static PyObject Py_affine_transform(PyObject self, PyObject args, PyObject k`
`471`	`471`
`472`	`472`	`if (PyArray_NDIM(vertices_arr) ==2) {`
`473`	`473`	`numpy::array_view<double,2>vertices(vertices_arr);`
	`474`	`+Py_DECREF(vertices_arr);`
	`475`	`+`
`474`	`476`	`npy_intp dims[] = { (npy_intp)vertices.size(),2 };`
`475`	`477`	`numpy::array_view<double,2>result(dims);`
`476`	`478`	`CALL_CPP("affine_transform", (affine_transform_2d(vertices, trans, result)));`
`477`		`-Py_DECREF(vertices_arr);`
`478`	`479`	`return result.pyobj();`
`479`	`480`	`}else {// PyArray_NDIM(vertices_arr) == 1`
`480`	`481`	`numpy::array_view<double,1>vertices(vertices_arr);`
	`482`	`+Py_DECREF(vertices_arr);`
	`483`	`+`
`481`	`484`	`npy_intp dims[] = { (npy_intp)vertices.size() };`
`482`	`485`	`numpy::array_view<double,1>result(dims);`
`483`	`486`	`CALL_CPP("affine_transform", (affine_transform_1d(vertices, trans, result)));`
`484`		`-Py_DECREF(vertices_arr);`
`485`	`487`	`return result.pyobj();`
`486`	`488`	`}`
`487`	`489`	`}`

Comments

(0)