mirror of
https://github.com/python/cpython.git
synced 2024-11-23 18:04:37 +08:00
_copy_characters() fails more quickly in debug mode on inconsistent state
This commit is contained in:
parent
46084bad88
commit
56c161ab00
@ -1052,20 +1052,32 @@ _copy_characters(PyObject *to, Py_ssize_t to_start,
|
||||
Py_UCS4 ch;
|
||||
Py_ssize_t i;
|
||||
|
||||
#ifdef Py_DEBUG
|
||||
for (i=0; i < how_many; i++) {
|
||||
ch = PyUnicode_READ(from_kind, from_data, from_start + i);
|
||||
if (check_maxchar) {
|
||||
if (ch > to_maxchar)
|
||||
return 1;
|
||||
}
|
||||
else {
|
||||
assert(ch <= to_maxchar);
|
||||
}
|
||||
assert(ch <= to_maxchar);
|
||||
PyUnicode_WRITE(to_kind, to_data, to_start + i, ch);
|
||||
}
|
||||
#else
|
||||
if (!check_maxchar) {
|
||||
for (i=0; i < how_many; i++) {
|
||||
ch = PyUnicode_READ(from_kind, from_data, from_start + i);
|
||||
PyUnicode_WRITE(to_kind, to_data, to_start + i, ch);
|
||||
}
|
||||
}
|
||||
else {
|
||||
for (i=0; i < how_many; i++) {
|
||||
ch = PyUnicode_READ(from_kind, from_data, from_start + i);
|
||||
if (ch > to_maxchar)
|
||||
return 1;
|
||||
PyUnicode_WRITE(to_kind, to_data, to_start + i, ch);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
else {
|
||||
return -1;
|
||||
assert(0 && "inconsistent state");
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
|
Loading…
Reference in New Issue
Block a user