diff options
| author | Stefan Krah <skrah@bytereef.org> | 2015-11-10 17:17:22 (GMT) |
|---|---|---|
| committer | Stefan Krah <skrah@bytereef.org> | 2015-11-10 17:17:22 (GMT) |
| commit | 0ce5b6e2688ddf342780b663a095b3e0c9f5cc72 (patch) | |
| tree | 36f44f86940823483ac4aef497fe37058bcf35e7 /Objects/memoryobject.c | |
| parent | e46e09d0f5fc5b47d508abc510d92be0aba95599 (diff) | |
| download | cpython-0ce5b6e2688ddf342780b663a095b3e0c9f5cc72.zip cpython-0ce5b6e2688ddf342780b663a095b3e0c9f5cc72.tar.gz cpython-0ce5b6e2688ddf342780b663a095b3e0c9f5cc72.tar.bz2 | |
Iaaue #25598: Fix memory_hex from #9951 for non-contiguous buffers.
Diffstat (limited to 'Objects/memoryobject.c')
| -rw-r--r-- | Objects/memoryobject.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c index 74cad7d..fe54366 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 * |