From c67df79a6a1c1968bf67809508c7ca0ec701d824 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Sun, 11 Jul 2010 12:14:05 +0000 Subject: Merged revisions 82814 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r82814 | antoine.pitrou | 2010-07-11 14:12:00 +0200 (dim., 11 juil. 2010) | 4 lines Issue #7616: Fix copying of overlapping memoryview slices with the Intel compiler. ........ --- Objects/memoryobject.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'Objects/memoryobject.c') diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c index 524521aadb..8c21ac1a4c 100644 --- a/Objects/memoryobject.c +++ b/Objects/memoryobject.c @@ -632,7 +632,7 @@ memory_subscript(PyMemoryViewObject *self, PyObject *key) static int memory_ass_sub(PyMemoryViewObject *self, PyObject *key, PyObject *value) { - Py_ssize_t start, len, bytelen, i; + Py_ssize_t start, len, bytelen; Py_buffer srcview; Py_buffer *view = &(self->view); char *srcbuf, *destbuf; @@ -702,16 +702,8 @@ memory_ass_sub(PyMemoryViewObject *self, PyObject *key, PyObject *value) if (destbuf + bytelen < srcbuf || srcbuf + bytelen < destbuf) /* No overlapping */ memcpy(destbuf, srcbuf, bytelen); - else if (destbuf < srcbuf) { - /* Copy in ascending order */ - for (i = 0; i < bytelen; i++) - destbuf[i] = srcbuf[i]; - } - else { - /* Copy in descencing order */ - for (i = bytelen - 1; i >= 0; i--) - destbuf[i] = srcbuf[i]; - } + else + memmove(destbuf, srcbuf, bytelen); PyBuffer_Release(&srcview); return 0; -- cgit v1.2.1