diff options
| author | Mark Dickinson <dickinsm@gmail.com> | 2009-10-26 21:51:18 (GMT) |
|---|---|---|
| committer | Mark Dickinson <dickinsm@gmail.com> | 2009-10-26 21:51:18 (GMT) |
| commit | f972488213c359e251d6a0b06759ce19ef33e48d (patch) | |
| tree | 94b3d779d16fb7e6cc8ed6f4218589a2aaf6d309 /Objects/complexobject.c | |
| parent | f0966c95687d1847b524f8794835568858a7934c (diff) | |
| download | cpython-f972488213c359e251d6a0b06759ce19ef33e48d.zip cpython-f972488213c359e251d6a0b06759ce19ef33e48d.tar.gz cpython-f972488213c359e251d6a0b06759ce19ef33e48d.tar.bz2 | |
Remove length limitation on string arguments to complex()
Diffstat (limited to 'Objects/complexobject.c')
| -rw-r--r-- | Objects/complexobject.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/Objects/complexobject.c b/Objects/complexobject.c index ccee382..b541308 100644 --- a/Objects/complexobject.c +++ b/Objects/complexobject.c @@ -740,20 +740,20 @@ complex_subtype_from_string(PyTypeObject *type, PyObject *v) char *end; double x=0.0, y=0.0, z; int got_bracket=0; - char s_buffer[256]; + char *s_buffer = NULL; Py_ssize_t len; if (PyUnicode_Check(v)) { - if (PyUnicode_GET_SIZE(v) >= (Py_ssize_t)sizeof(s_buffer)) { - PyErr_SetString(PyExc_ValueError, - "complex() literal too large to convert"); - return NULL; - } + s_buffer = (char *)PyMem_MALLOC(PyUnicode_GET_SIZE(v) + 1); + if (s_buffer == NULL) + return PyErr_NoMemory(); if (PyUnicode_EncodeDecimal(PyUnicode_AS_UNICODE(v), PyUnicode_GET_SIZE(v), s_buffer, - NULL)) + NULL)) { + PyMem_FREE(s_buffer); return NULL; + } s = s_buffer; len = strlen(s); } @@ -870,9 +870,13 @@ complex_subtype_from_string(PyTypeObject *type, PyObject *v) if (s-start != len) goto parse_error; + if (s_buffer) + PyMem_FREE(s_buffer); return complex_subtype_from_doubles(type, x, y); parse_error: + if (s_buffer) + PyMem_FREE(s_buffer); PyErr_SetString(PyExc_ValueError, "complex() arg is a malformed string"); return NULL; |