mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 87442 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r87442 | alexander.belopolsky | 2010-12-22 21:27:37 -0500 (Wed, 22 Dec 2010) | 1 line

  Issue #10254: Fixed a crash and a regression introduced by the implementation of PRI 29.
........
This commit is contained in:
Alexander Belopolsky 2010-12-28 15:47:56 +00:00
parent 5360d003b6
commit dce6cf353c
3 changed files with 23 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Modules/unicodedata.c
View file

@ -682,10 +682,14 @@ nfc_nfkc(PyObject *self, PyObject *input, int k)
comb = 0;
while (i1 < end) {
int comb1 = _getrecord_ex(*i1)->combining;
if (comb && (comb1 == 0 || comb == comb1)) {
/* Character is blocked. */
i1++;
continue;
if (comb) {
if (comb1 == 0)
break;
if (comb >= comb1) {
/* Character is blocked. */
i1++;
continue;
}
}
l = find_nfc_index(self, nfc_last, *i1);
/* *i1 cannot be combined with *i. If *i1
@ -709,6 +713,7 @@ nfc_nfkc(PyObject *self, PyObject *input, int k)
/* Replace the original character. */
*i = code;
/* Mark the second character unused. */
assert(cskipped < 20);
skipped[cskipped++] = i1;
i1++;
f = find_nfc_index(self, nfc_first, *i);