Merge pull request #3069 from jdufresne/deref

Fix dereferencing type-punned pointer will break strict-aliasing
This commit is contained in:
Hugo 2018-04-05 09:37:59 +01:00 committed by GitHub
commit 64400a5169
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions

View File

@ -17,6 +17,11 @@ class TestImagePath(PillowTestCase):
self.assertEqual(p[0], (0.0, 1.0))
self.assertEqual(p[-1], (8.0, 9.0))
self.assertEqual(list(p[:1]), [(0.0, 1.0)])
with self.assertRaises(TypeError) as cm:
p['foo']
self.assertEqual(
str(cm.exception),
"Path indices must be integers, not str")
self.assertEqual(
list(p),
[(0.0, 1.0), (2.0, 3.0), (4.0, 5.0), (6.0, 7.0), (8.0, 9.0)])

View File

@ -571,7 +571,7 @@ path_subscript(PyPathObject* self, PyObject* item) {
else {
PyErr_Format(PyExc_TypeError,
"Path indices must be integers, not %.200s",
Py_TYPE(&item)->tp_name);
Py_TYPE(item)->tp_name);
return NULL;
}
}