Skip to content

check transform mesh shape in _get_transform_mesh #31894

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
uwezkhan wants to merge 1 commit into
base: main
Choose a base branch
from
+25 −0
Open

check transform mesh shape in _get_transform_mesh #31894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions lib/matplotlib/tests/test_image.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1677,6 +1677,23 @@ def test__resample_valid_output():
resample(np.zeros((9, 9)), out)


def test__resample_nonaffine_mesh_shape():
# A non-affine transform whose inverse returns the wrong number of mesh
# points must be rejected rather than read past the mesh buffer.
class BadMeshTransform(Transform):
input_dims = output_dims = 2

def inverted(self):
return self

def transform(self, values):
return np.zeros((1, 2))

with pytest.raises(RuntimeError, match="mesh array should have shape"):
mpl._image.resample(np.zeros((9, 9)), np.zeros((9, 9)),
BadMeshTransform())


@pytest.mark.parametrize("data, interpolation, expected",
[(np.array([[0.1, 0.3, 0.2]]), mimage.NEAREST,
np.array([[0.1, 0.1, 0.1, 0.3, 0.3, 0.3, 0.3, 0.2, 0.2, 0.2]])),
Expand Down
8 changes: 8 additions & 0 deletions src/_image_wrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,14 @@ _get_transform_mesh(const py::object& transform, const py::ssize_t *dims)
output_mesh_array.ndim()));
}

if (output_mesh_array.shape(0) != mesh_dims[0] ||
output_mesh_array.shape(1) != mesh_dims[1]) {
throw std::runtime_error(
"Inverse transformed mesh array should have shape ({}, {}) not ({}, {})"_s.format(
mesh_dims[0], mesh_dims[1],
output_mesh_array.shape(0), output_mesh_array.shape(1)));
}

return output_mesh_array;
}

Expand Down
Loading