8000 BUG: fix wrong error checks of PyBytes_AsStringAndSize by juliantaylor · Pull Request #5088 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

BUG: fix wrong error checks of PyBytes_AsStringAndSize #5088

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 1 commit into from
Sep 19, 2014
Merged

BUG: fix wrong error checks of PyBytes_AsStringAndSize #5088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion numpy/core/src/multiarray/arraytypes.c.src
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ STRING_setitem(PyObject *op, char *ov, PyArrayObject *ap)
return -1;
}
#endif
if (PyBytes_AsStringAndSize(temp, &ptr, &len) == -1) {
if (PyBytes_AsStringAndSize(temp, &ptr, &len) < 0) {
Py_DECREF(temp);
return -1;
}
Expand Down
1 change: 1 addition & 0 deletions numpy/core/src/multiarray/buffer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,7 @@ _buffer_format_string(PyArray_Descr *descr, _tmp_string_t *str,
tmp = name;
#endif
if (tmp == NULL || PyBytes_AsStringAndSize(tmp, &p, &len) < 0) {
PyErr_Clear();
PyErr_SetString(PyExc_ValueError, "invalid field name");
return -1;
}
Expand Down
2 changes: 1 addition & 1 deletion numpy/core/src/multiarray/conversion_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,7 +689,7 @@ PyArray_CastingConverter(PyObject *obj, NPY_CASTING *casting)
return ret;
}

if (PyBytes_AsStringAndSize(obj, &str, &length) == -1) {
if (PyBytes_AsStringAndSize(obj, &str, &length) < 0) {
return 0;
}

Expand Down
4 changes: 2 additions & 2 deletions numpy/core/src/multiarray/datetime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2369,7 +2369,7 @@ convert_pyobject_to_datetime(PyArray_DatetimeMetaData *meta, PyObject *obj,
bytes = obj;
Py_INCREF(bytes);
}
if (PyBytes_AsStringAndSize(bytes, &str, &len) == -1) {
if (PyBytes_AsStringAndSize(bytes, &str, &len) < 0) {
Py_DECREF(bytes);
return -1;
}
Expand Down Expand Up @@ -2558,7 +2558,7 @@ convert_pyobject_to_timedelta(PyArray_DatetimeMetaData *meta, PyObject *obj,
bytes = obj;
Py_INCREF(bytes);
}
if (PyBytes_AsStringAndSize(bytes, &str, &len) == -1) {
if (PyBytes_AsStringAndSize(bytes, &str, &len) < 0) {
Py_DECREF(bytes);
return -1;
}
Expand Down
2 changes: 1 addition & 1 deletion numpy/core/src/multiarray/descriptor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2476,7 +2476,7 @@ arraydescr_setstate(PyArray_Descr *self, PyObject *args)
endian_obj = tmp;
}

if (PyBytes_AsStringAndSize(endian_obj, &str, &len) == -1) {
if (PyBytes_AsStringAndSize(endian_obj, &str, &len) < 0) {
Py_XDECREF(tmp);
return NULL;
}
Expand Down
2 changes: 1 addition & 1 deletion numpy/core/src/multiarray/methods.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1687,7 +1687,7 @@ array_setstate(PyArrayObject *self, PyObject *args)
return NULL;
}

if (PyBytes_AsStringAndSize(rawdata, &datastr, &len)) {
if (PyBytes_AsStringAndSize(rawdata, &datastr, &len) < 0) {
Py_DECREF(rawdata);
return NULL;
}
Expand Down
7 changes: 4 additions & 3 deletions numpy/core/src/multiarray/nditer_pywrap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ NpyIter_GlobalFlagsConverter(PyObject *flags_in, npy_uint32 *flags)
f = f_str;
}

if (PyBytes_AsStringAndSize(f, &str, &length) == -1) {
if (PyBytes_AsStringAndSize(f, &str, &length) < 0) {
Py_DECREF(f);
return 0;
}
Expand Down Expand Up @@ -238,7 +238,7 @@ npyiter_order_converter(PyObject *order_in, NPY_ORDER *order)
return ret;
}

if (PyBytes_AsStringAndSize(order_in, &str, &length) == -1) {
if (PyBytes_AsStringAndSize(order_in, &str, &length) < 0) {
return 0;
}

Expand Down Expand Up @@ -300,7 +300,8 @@ NpyIter_OpFlagsConverter(PyObject *op_flags_in,
f = f_str;
}

if (PyBytes_AsStringAndSize(f, &str, &length) == -1) {
if (PyBytes_AsStringAndSize(f, &str, &length) < 0) {
PyErr_Clear();
Py_DECREF(f);
PyErr_SetString(PyExc_ValueError,
"op_flags must be a tuple or array of per-op flag-tuples");
Expand Down
3 changes: 2 additions & 1 deletion numpy/core/src/umath/ufunc_object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -927,7 +927,8 @@ static int get_ufunc_arguments(PyUFuncObject *ufunc,
}
#endif

if (PyBytes_AsStringAndSize(key, &str, &length) == -1) {
if (PyBytes_AsStringAndSize(key, &str, &length) < 0) {
PyErr_Clear();
PyErr_SetString(PyExc_TypeError, "invalid keyword argument");
goto fail;
}
Expand Down
2 changes: 1 addition & 1 deletion numpy/core/src/umath/ufunc_type_resolution.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2044,7 +2044,7 @@ type_tuple_type_resolver(PyUFuncObject *self,
type_tup = str_obj;
}

if (!PyBytes_AsStringAndSize(type_tup, &str, &length) < 0) {
if (PyBytes_AsStringAndSize(type_tup, &str, &length) < 0) {
Py_XDECREF(str_obj);
return -1;
}
Expand Down
0