8000 BUG: have `_array_from_buffer_3118` correctly handle errors by eric-wieser · Pull Request #10882 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

BUG: have _array_from_buffer_3118 correctly handle errors #10882

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 25, 2018
Merged

BUG: have _array_from_buffer_3118 correctly handle errors #10882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
056babb
BUG: have _array_from_buffer_3118 correctly handle errors
eric-wieser Apr 11, 2018
63e9cfb
TST: Work around memory leak in ctypes to prevent another test failing
eric-wieser Apr 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 42 additions & 43 deletions numpy/core/src/multiarray/ctors.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1276,42 +1276,31 @@ PyArray_New(PyTypeObject *subtype, int nd, npy_intp *dims, int type_num,
}


NPY_NO_EXPORT int
_array_from_buffer_3118(PyObject *obj, PyObject **out)
/* Steals a reference to the memory view */
NPY_NO_EXPORT PyObject *
_array_from_buffer_3118(PyObject *memoryview)
{
/* PEP 3118 */
PyObject *memoryview;
Py_buffer *view;
PyArray_Descr *descr = NULL;
PyObject *r;
int nd, flags, k;
PyObject *r = NULL;
int nd, flags;
Py_ssize_t d;
npy_intp shape[NPY_MAXDIMS], strides[NPY_MAXDIMS];

memoryview = PyMemoryView_FromObject(obj);
if (memoryview == NULL) {
PyErr_Clear();
return -1;
}

view = PyMemoryView_GET_BUFFER(memoryview);
if (view->format != NULL) {
descr = _descriptor_from_pep3118_format(view->format);
if (descr == NULL) {
PyObject *msg;
msg = PyBytes_FromFormat("Invalid PEP 3118 format string: '%s'",
view->format);
PyErr_WarnEx(PyExc_RuntimeWarning, PyBytes_AS_STRING(msg), 0);
Py_DECREF(msg);
goto fail;
}

/* Sanity check */
if (descr->elsize != view->itemsize) {
PyErr_WarnEx(PyExc_RuntimeWarning,
"Item size computed from the PEP 3118 buffer format "
"string does not match the actual item size.",
0);
PyErr_SetString(
PyExc_RuntimeError,
"Item size computed from the PEP 3118 buffer format "
"string does not match the actual item size.");
goto fail;
}
}
Expand All @@ -1322,13 +1311,13 @@ _array_from_buffer_3118(PyObject *obj, PyObject **out)

nd = view->ndim;
if (view->shape != NULL) {
if (nd >= NPY_MAXDIMS || nd < 0) {
int k;
if (nd > NPY_MAXDIMS || nd < 0) {
PyErr_Format(PyExc_RuntimeError,
"PEP3118 dimensions do not satisfy 0 <= ndim <= NPY_MAXDIMS");
goto fail;
}
for (k = 0; k < nd; ++k) {
if (k >= NPY_MAXDIMS) {
goto fail;
}
shape[k] = view->shape[k];
}
if (view->strides != NULL) {
Expand All @@ -1352,10 +1341,9 @@ _array_from_buffer_3118(PyObject *obj, PyObject **out)
strides[0] = view->itemsize;
}
else if (nd > 1) {
PyErr_WarnEx(PyExc_RuntimeWarning,
"ndim computed from the PEP 3118 buffer format "
"is greater than 1, but shape is NULL.",
0);
PyErr_SetString(PyExc_RuntimeError,
"ndim computed from the PEP 3118 buffer format "
"is greater than 1, but shape is NULL.");
goto fail;
}
}
Expand All @@ -1364,21 +1352,21 @@ _array_from_buffer_3118(PyObject *obj, PyObject **out)
r = PyArray_NewFromDescr(&PyArray_Type, descr,
nd, shape, strides, view->buf,
flags, NULL);
if (r == NULL ||
PyArray_SetBaseObject((PyArrayObject *)r, memoryview) < 0) {
Py_XDECREF(r);
Py_DECREF(memoryview);
return -1;
if (r == NULL) {
goto fail;
}
if (PyArray_SetBaseObject((PyArrayObject *)r, memoryview) < 0) {
goto fail;
}
PyArray_UpdateFlags((PyArrayObject *)r, NPY_ARRAY_UPDATE_ALL);

*out = r;
return 0;
return r;

fail:
Py_XDECREF(r);
Py_XDECREF(descr);
Py_DECREF(memoryview);
return -1;
return NULL;

}

Expand Down Expand Up @@ -1490,14 +1478,25 @@ PyArray_GetArrayParamsFromObject(PyObject *op,
}

/* If op supports the PEP 3118 buffer interface */
if (!PyBytes_Check(op) && !PyUnicode_Check(op) &&
_array_from_buffer_3118(op, (PyObject **)out_arr) == 0) {
if (writeable
&& PyArray_FailUnlessWriteable(*out_arr, "PEP 3118 buffer") < 0) {
Py_DECREF(*out_arr);
return -1;
if (!PyBytes_Check(op) && !PyUnicode_Check(op)) {

PyObject *memoryview = PyMemoryView_FromObject(op);
if (memoryview == NULL) {
PyErr_Clear();
}
else {
PyObject *arr = _array_from_buffer_3118(memoryview);
if (arr == NULL) {
return -1;
}
if (writeable
&& PyArray_FailUnlessWriteable((PyArrayObject *)arr, "PEP 3118 buffer") < 0) {
Py_DECREF(arr);
return -1;
}
*out_arr = (PyArrayObject *)arr;
return 0;
}
return (*out_arr) == NULL ? -1 : 0;
}

/* If op supports the __array_struct__ or __array_interface__ interface */
Expand Down
36 changes: 36 additions & 0 deletions numpy/core/tests/test_multiarray.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6204,7 +6204,10 @@ def test_unnamed_fields(self):
self._check('i', 'i')
self._check('i:f0:', [('f0', 'i')])


class TestNewBufferProtocol(object):
""" Test PEP3118 buffers """

def _check_roundtrip(self, obj):
obj = np.asarray(obj)
x = memoryview(obj)
Expand Down Expand Up @@ -6515,6 +6518,39 @@ def test_out_of_order_fields(self):
with assert_raises(ValueError):
memoryview(arr)

def test_max_dims(self):
a = np.empty((1,) * 32)
self._check_roundtrip(a)

def _make_ctype(shape, scalar_type):
t = scalar_type
for dim in shape[::-1]:
t = dim * t
return t

# This creates deeply nested reference cycles that cause
# np.lib.tests.test_io.test_load_refcount to erroneously fail (gh-10891).
# Not making it a local ensure that the GC doesn't touch it during the tests
c_u8_33d = _make_ctype((1,)*33, ctypes.c_uint8)

def test_error_too_many_dims(self):
# construct a memoryview with 33 dimensions
m = memoryview(self.c_u8_33d())
assert_equal(m.ndim, 33)

assert_raises_regex(
RuntimeError, "ndim",
np.array, m)

def test_error_pointer_type(self):
# gh-6741
m = memoryview(ctypes.pointer(ctypes.c_uint8()))
assert_('&' in m.format)

assert_raises_regex(
ValueError, "format string",
np.array, m)


class TestArrayAttributeDeletion(object):

Expand Down
0