Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Apply perky's fix for #1503157: "/".join([u"", u""]) raising OverflowError. 

Also improve error message on overflow.
This commit is contained in:
Georg Brandl 2006-06-10 06:40:50 +00:00
parent 6946ea0be0
commit 90e27d38f5
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/test/string_tests.py
View File

@ -938,6 +938,8 @@ class MixinStrUnicodeUserStringTest:
# test.test_string.StringTest.test_join)
self.checkequal('a b c d', ' ', 'join', ['a', 'b', 'c', 'd'])
self.checkequal('abcd', '', 'join', ('a', 'b', 'c', 'd'))
self.checkequal('bd', '', 'join', ('', 'b', '', 'd'))
self.checkequal('ac', '', 'join', ('a', '', 'c', ''))
self.checkequal('w x y z', ' ', 'join', Sequence())
self.checkequal('abc', 'a', 'join', ('abc',))
self.checkequal('z', 'a', 'join', UserList(['z']))

2
Objects/stringobject.c
View File

@ -1788,7 +1788,7 @@ string_join(PyStringObject *self, PyObject *orig)
sz += seplen;
if (sz < old_sz || sz > PY_SSIZE_T_MAX) {
PyErr_SetString(PyExc_OverflowError,
"join() is too long for a Python string");
"join() result is too long for a Python string");
Py_DECREF(seq);
return NULL;
}

6
Objects/unicodeobject.c
View File

@ -4491,11 +4491,11 @@ PyUnicode_Join(PyObject *separator, PyObject *seq)
/* Make sure we have enough space for the separator and the item. */
itemlen = PyUnicode_GET_SIZE(item);
new_res_used = res_used + itemlen;
if (new_res_used <= 0)
if (new_res_used < 0)
goto Overflow;
if (i < seqlen - 1) {
new_res_used += seplen;
if (new_res_used <= 0)
if (new_res_used < 0)
goto Overflow;
}
if (new_res_used > res_alloc) {
@ -4536,7 +4536,7 @@ PyUnicode_Join(PyObject *separator, PyObject *seq)
Overflow:
PyErr_SetString(PyExc_OverflowError,
"join() is too long for a Python string");
"join() result is too long for a Python string");
Py_DECREF(item);
/* fall through */