diff --git a/Lib/test/test_buffer.py b/Lib/test/test_buffer.py index a6533904153..2eef9fc6859 100644 --- a/Lib/test/test_buffer.py +++ b/Lib/test/test_buffer.py @@ -841,6 +841,11 @@ class TestBufferProtocol(unittest.TestCase): # test tobytes() self.assertEqual(result.tobytes(), b) + # test hex() + m = memoryview(result) + h = "".join("%02x" % c for c in b) + self.assertEqual(m.hex(), h) + # lst := expected multi-dimensional logical representation # flatten(lst) := elements in C-order ff = fmt if fmt else 'B' diff --git a/Lib/test/test_memoryview.py b/Lib/test/test_memoryview.py index da01a84f274..d2bab381042 100644 --- a/Lib/test/test_memoryview.py +++ b/Lib/test/test_memoryview.py @@ -512,6 +512,13 @@ class OtherTest(unittest.TestCase): m[2:] = memoryview(p6).cast(format)[2:] self.assertEqual(d.value, 0.6) + def test_memoryview_hex(self): + # Issue #9951: memoryview.hex() segfaults with non-contiguous buffers. + x = b'0' * 200000 + m1 = memoryview(x) + m2 = m1[::-1] + self.assertEqual(m2.hex(), '30' * 200000) + if __name__ == "__main__": unittest.main() diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c index 74cad7dc0ef..fe543662c97 100644 --- a/Objects/memoryobject.c +++ b/Objects/memoryobject.c @@ -2156,8 +2156,23 @@ static PyObject * memory_hex(PyMemoryViewObject *self, PyObject *dummy) { Py_buffer *src = VIEW_ADDR(self); + PyObject *bytes; + PyObject *ret; + CHECK_RELEASED(self); - return _Py_strhex(src->buf, src->len); + + if (MV_C_CONTIGUOUS(self->flags)) { + return _Py_strhex(src->buf, src->len); + } + + bytes = memory_tobytes(self, dummy); + if (bytes == NULL) + return NULL; + + ret = _Py_strhex(PyBytes_AS_STRING(bytes), Py_SIZE(bytes)); + Py_DECREF(bytes); + + return ret; } static PyObject *