diff options
| author | Stefan Krah <skrah@bytereef.org> | 2015-02-01 15:19:23 (GMT) |
|---|---|---|
| committer | Stefan Krah <skrah@bytereef.org> | 2015-02-01 15:19:23 (GMT) |
| commit | 7213fcc27ec4ca06fbda4633aff95d8ca2701e43 (patch) | |
| tree | c3910dd4930e706620d0db6a4a8d370bf2add246 /Objects | |
| parent | f046dfe60e0e709fac674a5d142caf14d21af1f0 (diff) | |
| download | cpython-7213fcc27ec4ca06fbda4633aff95d8ca2701e43.zip cpython-7213fcc27ec4ca06fbda4633aff95d8ca2701e43.tar.gz cpython-7213fcc27ec4ca06fbda4633aff95d8ca2701e43.tar.bz2 | |
Issue #23370: Fix off-by-one error for non-contiguous buffers.
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/abstract.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Objects/abstract.c b/Objects/abstract.c index eec9532..9ed3f92 100644 --- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -488,7 +488,7 @@ PyBuffer_FromContiguous(Py_buffer *view, void *buf, Py_ssize_t len, char fort) /* Otherwise a more elaborate scheme is needed */ - /* XXX(nnorwitz): need to check for overflow! */ + /* view->ndim <= 64 */ indices = (Py_ssize_t *)PyMem_Malloc(sizeof(Py_ssize_t)*(view->ndim)); if (indices == NULL) { PyErr_NoMemory(); @@ -510,10 +510,10 @@ PyBuffer_FromContiguous(Py_buffer *view, void *buf, Py_ssize_t len, char fort) */ elements = len / view->itemsize; while (elements--) { - addone(view->ndim, indices, view->shape); ptr = PyBuffer_GetPointer(view, indices); memcpy(ptr, src, view->itemsize); src += view->itemsize; + addone(view->ndim, indices, view->shape); } PyMem_Free(indices); |