diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2011-01-18 19:06:19 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2011-01-18 19:06:19 (GMT) |
| commit | 3013b16b62be7768700d685f6a68e606b5f20e5a (patch) | |
| tree | 841a69e91c9102f4585e7bc11eb9c719ef689795 /Objects/memoryobject.c | |
| parent | 4a70550c1c3fb74985a2f4dd91a9a9cdb9e2fed6 (diff) | |
| download | cpython-3013b16b62be7768700d685f6a68e606b5f20e5a.zip cpython-3013b16b62be7768700d685f6a68e606b5f20e5a.tar.gz cpython-3013b16b62be7768700d685f6a68e606b5f20e5a.tar.bz2 | |
Merged revisions 88097 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88097 | antoine.pitrou | 2011-01-18 19:57:52 +0100 (mar., 18 janv. 2011) | 4 lines
Issue #10451: memoryview objects could allow to mutate a readable buffer.
Initial patch by Ross Lagerwall.
........
Diffstat (limited to 'Objects/memoryobject.c')
| -rw-r--r-- | Objects/memoryobject.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c index 4997fcc..2bac266 100644 --- a/Objects/memoryobject.c +++ b/Objects/memoryobject.c @@ -34,9 +34,6 @@ static int memory_getbuf(PyMemoryViewObject *self, Py_buffer *view, int flags) { int res = 0; - /* XXX for whatever reason fixing the flags seems necessary */ - if (self->view.readonly) - flags &= ~PyBUF_WRITABLE; if (self->view.obj != NULL) res = PyObject_GetBuffer(self->view.obj, view, flags); if (view) @@ -411,7 +408,7 @@ memory_tobytes(PyMemoryViewObject *self, PyObject *noargs) Py_buffer view; PyObject *res; - if (PyObject_GetBuffer((PyObject *)self, &view, PyBUF_FULL) < 0) + if (PyObject_GetBuffer((PyObject *)self, &view, PyBUF_SIMPLE) < 0) return NULL; res = PyBytes_FromStringAndSize(NULL, view.len); |