mirror of
https://github.com/python/cpython.git
synced 2025-07-15 07:15:18 +00:00
Issue #13093: Fix error handling on PyUnicode_EncodeDecimal()
* Add tests for PyUnicode_EncodeDecimal() and PyUnicode_TransformDecimalToASCII() * Remove the unused "e" variable in replace()
This commit is contained in:
parent
58fcf9f801
commit
ab1d16b456
3 changed files with 89 additions and 8 deletions
|
@ -6323,11 +6323,10 @@ int PyUnicode_EncodeDecimal(Py_UNICODE *s,
|
|||
}
|
||||
/* All other characters are considered unencodable */
|
||||
collstart = p;
|
||||
collend = p+1;
|
||||
while (collend < end) {
|
||||
for (collend = p+1; collend < end; collend++) {
|
||||
if ((0 < *collend && *collend < 256) ||
|
||||
!Py_UNICODE_ISSPACE(*collend) ||
|
||||
Py_UNICODE_TODECIMAL(*collend))
|
||||
Py_UNICODE_ISSPACE(*collend) ||
|
||||
0 <= Py_UNICODE_TODECIMAL(*collend))
|
||||
break;
|
||||
}
|
||||
/* cache callback name lookup
|
||||
|
@ -7004,7 +7003,7 @@ PyObject *replace(PyUnicodeObject *self,
|
|||
}
|
||||
} else {
|
||||
|
||||
Py_ssize_t n, i, j, e;
|
||||
Py_ssize_t n, i, j;
|
||||
Py_ssize_t product, new_size, delta;
|
||||
Py_UNICODE *p;
|
||||
|
||||
|
@ -7036,7 +7035,6 @@ PyObject *replace(PyUnicodeObject *self,
|
|||
return NULL;
|
||||
i = 0;
|
||||
p = u->str;
|
||||
e = self->length - str1->length;
|
||||
if (str1->length > 0) {
|
||||
while (n-- > 0) {
|
||||
/* look for next match */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue