traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

_copy_characters() fails more quickly in debug mode on inconsistent state

This commit is contained in:
Victor Stinner 2011-10-06 02:47:11 +02:00
parent 46084bad88
commit 56c161ab00
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Objects/unicodeobject.c
View File

@ -1052,20 +1052,32 @@ _copy_characters(PyObject *to, Py_ssize_t to_start,
Py_UCS4 ch; Py_UCS4 ch;
Py_ssize_t i; Py_ssize_t i;
#ifdef Py_DEBUG
for (i=0; i < how_many; i++) { for (i=0; i < how_many; i++) {
ch = PyUnicode_READ(from_kind, from_data, from_start + 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); PyUnicode_WRITE(to_kind, to_data, to_start + i, ch);
} }
} }
else { else {
return -1; 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 {
assert(0 && "inconsistent state");
return 1;
} }
} }
return 0; return 0;