mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-19 16:20:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Backport 55874:

Browse source 
Fix a bug when there was a newline in the string expandtabs was called on.
This also catches another condition that can overflow.
This commit is contained in:
Neal Norwitz 2007-06-11 04:32:41 +00:00
parent 11c5275c61
commit 8355dd5806
3 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Objects/unicodeobject.c
View file

@ -5701,7 +5701,8 @@ unicode_expandtabs(PyUnicodeObject *self, PyObject *args)
if (tabsize > 0) {
j += tabsize - (j % tabsize);
if (old_j > j) {
PyErr_SetString(PyExc_OverflowError, "new string is too long");
PyErr_SetString(PyExc_OverflowError,
"new string is too long");
return NULL;
}
old_j = j;
@ -5711,7 +5712,12 @@ unicode_expandtabs(PyUnicodeObject *self, PyObject *args)
j++;
if (*p == '\n' || *p == '\r') {
i += j;
j = 0;
old_j = j = 0;
if (i < 0) {
PyErr_SetString(PyExc_OverflowError,
"new string is too long");
return NULL;
}
}
}