Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-06 20:10:08 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Be more strict about what is acceptable input for the wxArray* mapped types

Browse Source
This commit is contained in:
Robin Dunn
2020-04-07 16:29:03 -07:00
parent 8750ef29f1
commit bf0d0fc027
1 changed files with 52 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/arrays.sip
View File

@@ -23,8 +23,22 @@
// Code to test a PyObject for compatibility
// Verify that the object is a sequence, but not bytes or unicode
if (!sipIsErr) {
return (PySequence_Check(sipPy) &&
!(PyBytes_Check(sipPy) || PyUnicode_Check(sipPy)));
if (PySequence_Check(sipPy) &&
!(PyBytes_Check(sipPy) || PyUnicode_Check(sipPy))) {
Py_ssize_t i, len = PySequence_Length(sipPy);
bool failed;
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(sipPy, i);
failed = !PyBytes_Check(item) && !PyUnicode_Check(item);
Py_DECREF(item);
if (failed)
return FALSE;
}
return TRUE;
}
return FALSE;
}
@@ -37,13 +51,13 @@
// Ensure each item is a bytes or string/unicode object
if ( !PyBytes_Check(item) && !PyUnicode_Check(item) ) {
// raise a TypeError if not
PyErr_Format(PyExc_TypeError,
PyErr_Format(PyExc_TypeError,
"Item at index %zd has type '%s' but a sequence of bytes or strings is expected",
i, sipPyTypeName(Py_TYPE(item)));
delete array;
Py_DECREF(item);
*sipIsErr = 1;
return 0;
return 0;
}
// if it's a string object convert it to unicode first, assuming utf-8
@@ -109,8 +123,21 @@ wxArrayString testArrayStringTypemap(const wxArrayString& arr);
%ConvertToTypeCode
// Code to test a PyObject for compatibility
if (!sipIsErr) {
return (PySequence_Check(sipPy) &&
!(PyBytes_Check(sipPy) || PyUnicode_Check(sipPy)));
if (PySequence_Check(sipPy) &&
!(PyBytes_Check(sipPy) || PyUnicode_Check(sipPy))) {
Py_ssize_t i, len = PySequence_Length(sipPy);
bool failed;
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(sipPy, i);
failed = !PyNumber_Check(item);
Py_DECREF(item);
if (failed)
return FALSE;
}
return TRUE;
}
return FALSE;
}
// Code to create a new wxArrayInt and convert a compatible PyObject
@@ -122,13 +149,13 @@ wxArrayString testArrayStringTypemap(const wxArrayString& arr);
// Ensure each item is a number object
if ( !PyNumber_Check(item) ) {
// raise a TypeError if not
PyErr_Format(PyExc_TypeError,
PyErr_Format(PyExc_TypeError,
"Item at index %zd has type '%s' but a sequence of numbers is expected",
i, sipPyTypeName(Py_TYPE(item)));
delete array;
Py_DECREF(item);
*sipIsErr = 1;
return 0;
return 0;
}
// Convert to Integer
@@ -182,8 +209,21 @@ wxArrayInt testArrayIntTypemap(const wxArrayInt& arr);
%ConvertToTypeCode
// Code to test a PyObject for compatibility
if (!sipIsErr) {
return (PySequence_Check(sipPy) &&
!(PyBytes_Check(sipPy) || PyUnicode_Check(sipPy)));
if (PySequence_Check(sipPy) &&
!(PyBytes_Check(sipPy) || PyUnicode_Check(sipPy))) {
Py_ssize_t i, len = PySequence_Length(sipPy);
bool failed;
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(sipPy, i);
failed = !PyNumber_Check(item);
Py_DECREF(item);
if (failed)
return FALSE;
}
return TRUE;
}
return FALSE;
}
// Code to create a new wxArrayDouble and convert a compatible PyObject
@@ -195,13 +235,13 @@ wxArrayInt testArrayIntTypemap(const wxArrayInt& arr);
// Ensure each item is a number object
if ( !PyNumber_Check(item) ) {
// raise a TypeError if not
PyErr_Format(PyExc_TypeError,
PyErr_Format(PyExc_TypeError,
"Item at index %zd has type '%s' but a sequence of numbers is expected",
i, sipPyTypeName(Py_TYPE(item)));
delete array;
Py_DECREF(item);
*sipIsErr = 1;
return 0;
return 0;
}
// Convert to a Float