diff options
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/bytesobject.c | 6 | ||||
| -rw-r--r-- | Objects/stringobject.c | 6 | ||||
| -rw-r--r-- | Objects/unicodeobject.c | 7 |
3 files changed, 17 insertions, 2 deletions
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c index 1cfdbae..d786014 100644 --- a/Objects/bytesobject.c +++ b/Objects/bytesobject.c @@ -108,7 +108,11 @@ PyBytes_FromStringAndSize(const char *bytes, Py_ssize_t size) PyBytesObject *new; Py_ssize_t alloc; - assert(size >= 0); + if (size < 0) { + PyErr_SetString(PyExc_SystemError, + "Negative size passed to PyBytes_FromStringAndSize"); + return NULL; + } new = PyObject_New(PyBytesObject, &PyBytes_Type); if (new == NULL) diff --git a/Objects/stringobject.c b/Objects/stringobject.c index d714a77..370ac41 100644 --- a/Objects/stringobject.c +++ b/Objects/stringobject.c @@ -64,7 +64,11 @@ PyObject * PyString_FromStringAndSize(const char *str, Py_ssize_t size) { register PyStringObject *op; - assert(size >= 0); + if (size < 0) { + PyErr_SetString(PyExc_SystemError, + "Negative size passed to PyString_FromStringAndSize"); + return NULL; + } if (size == 0 && (op = nullstring) != NULL) { #ifdef COUNT_ALLOCS null_strings++; diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index fe49ec8..388734e 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -497,6 +497,13 @@ PyObject *PyUnicode_FromUnicode(const Py_UNICODE *u, PyObject *PyUnicode_FromStringAndSize(const char *u, Py_ssize_t size) { PyUnicodeObject *unicode; + + if (size < 0) { + PyErr_SetString(PyExc_SystemError, + "Negative size passed to PyUnicode_FromStringAndSize"); + return NULL; + } + /* If the Unicode data is known at construction time, we can apply some optimizations which share commonly used objects. Also, this means the input must be UTF-8, so fall back to the |