diff options
| author | Armin Rigo <arigo@tunes.org> | 2006-08-09 15:37:26 (GMT) |
|---|---|---|
| committer | Armin Rigo <arigo@tunes.org> | 2006-08-09 15:37:26 (GMT) |
| commit | 97ff04789de3e37af585648de70260a54a29bd47 (patch) | |
| tree | d992c6d54983772958d2ac9fa7d72ef64b022a0d /Python/ceval.c | |
| parent | c95f7569e875f609ceb7f07d24c09ace9c6111b0 (diff) | |
| download | cpython-97ff04789de3e37af585648de70260a54a29bd47.zip cpython-97ff04789de3e37af585648de70260a54a29bd47.tar.gz cpython-97ff04789de3e37af585648de70260a54a29bd47.tar.bz2 | |
Concatenation on a long string breaks (SF #1526585).
Diffstat (limited to 'Python/ceval.c')
| -rw-r--r-- | Python/ceval.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Python/ceval.c b/Python/ceval.c index ef484d9..a0e8b30 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -4225,6 +4225,14 @@ string_concatenate(PyObject *v, PyObject *w, { /* This function implements 'variable += expr' when both arguments are strings. */ + Py_ssize_t v_len = PyString_GET_SIZE(v); + Py_ssize_t w_len = PyString_GET_SIZE(w); + Py_ssize_t new_len = v_len + w_len; + if (new_len < 0) { + PyErr_SetString(PyExc_OverflowError, + "strings are too large to concat"); + return NULL; + } if (v->ob_refcnt == 2) { /* In the common case, there are 2 references to the value @@ -4269,9 +4277,7 @@ string_concatenate(PyObject *v, PyObject *w, /* Now we own the last reference to 'v', so we can resize it * in-place. */ - Py_ssize_t v_len = PyString_GET_SIZE(v); - Py_ssize_t w_len = PyString_GET_SIZE(w); - if (_PyString_Resize(&v, v_len + w_len) != 0) { + if (_PyString_Resize(&v, new_len) != 0) { /* XXX if _PyString_Resize() fails, 'v' has been * deallocated so it cannot be put back into 'variable'. * The MemoryError is raised when there is no value in |