summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wouters <thomas@python.org>2006-04-19 15:09:44 (GMT)
committerThomas Wouters <thomas@python.org>2006-04-19 15:09:44 (GMT)
commit79cdce35de9c41912e8c999b36a13a52148c791e (patch)
tree093d4468b984fc14d2983cb3ed6831fa95f503a3
parent4abb3660ca43ffa22e1879dac238c2ed7c406389 (diff)
downloadcpython-79cdce35de9c41912e8c999b36a13a52148c791e.zip
cpython-79cdce35de9c41912e8c999b36a13a52148c791e.tar.gz
cpython-79cdce35de9c41912e8c999b36a13a52148c791e.tar.bz2
Teach Python/ceval.c's inlining of 'str += str' about Py_ssize_t sizes; this
was having funny effects when called on >2Gb strings ;P
-rw-r--r--Python/ceval.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Python/ceval.c b/Python/ceval.c
index 4a5882c..c0d87a5 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -4238,8 +4238,8 @@ string_concatenate(PyObject *v, PyObject *w,
/* Now we own the last reference to 'v', so we can resize it
* in-place.
*/
- int v_len = PyString_GET_SIZE(v);
- int w_len = PyString_GET_SIZE(w);
+ 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) {
/* XXX if _PyString_Resize() fails, 'v' has been
* deallocated so it cannot be put back into 'variable'.