diff options
| -rw-r--r-- | Lib/test/test_buffer.py | 2 | ||||
| -rw-r--r-- | Modules/_testbuffer.c | 16 |
2 files changed, 16 insertions, 2 deletions
diff --git a/Lib/test/test_buffer.py b/Lib/test/test_buffer.py index 80f4346..fb85dae 100644 --- a/Lib/test/test_buffer.py +++ b/Lib/test/test_buffer.py @@ -1212,6 +1212,8 @@ class TestBufferProtocol(unittest.TestCase): self.assertRaises(TypeError, get_contiguous, nd, PyBUF_READ, 961) self.assertRaises(UnicodeEncodeError, get_contiguous, nd, PyBUF_READ, '\u2007') + self.assertRaises(ValueError, get_contiguous, nd, PyBUF_READ, 'Z') + self.assertRaises(ValueError, get_contiguous, nd, 255, 'A') # cmp_contig() nd = ndarray([1], shape=[1]) diff --git a/Modules/_testbuffer.c b/Modules/_testbuffer.c index b291a14..87ada0a 100644 --- a/Modules/_testbuffer.c +++ b/Modules/_testbuffer.c @@ -2362,6 +2362,13 @@ get_ascii_order(PyObject *order) ord = PyBytes_AS_STRING(ascii_order)[0]; Py_DECREF(ascii_order); + + if (ord != 'C' && ord != 'F' && ord != 'A') { + PyErr_SetString(PyExc_ValueError, + "invalid order, must be C, F or A"); + return CHAR_MAX; + } + return ord; } @@ -2384,15 +2391,20 @@ get_contiguous(PyObject *self, PyObject *args) "buffertype must be PyBUF_READ or PyBUF_WRITE"); return NULL; } + type = PyLong_AsLong(buffertype); if (type == -1 && PyErr_Occurred()) { return NULL; } + if (type != PyBUF_READ && type != PyBUF_WRITE) { + PyErr_SetString(PyExc_ValueError, + "invalid buffer type"); + return NULL; + } ord = get_ascii_order(order); - if (ord == CHAR_MAX) { + if (ord == CHAR_MAX) return NULL; - } return PyMemoryView_GetContiguous(obj, (int)type, ord); } |