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

Overallocate target buffer for normalization more early. Fixes #834676.

Browse source 
Backported to 2.3.
This commit is contained in:
Martin v. Löwis 2003-11-06 20:47:57 +00:00
parent 85c20a41df
commit d2171d2ba4
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Lib/test/test_normalization.py
View file

@ -84,5 +84,8 @@ def test_main():
continue continue
assert X == NFC(X) == NFD(X) == NFKC(X) == NFKD(X), c assert X == NFC(X) == NFD(X) == NFKC(X) == NFKD(X), c
# Check for bug 834676
normalize('NFC',u'\ud55c\uae00')
if __name__ == "__main__": if __name__ == "__main__":
test_main() test_main()

12
Modules/unicodedata.c
View file

@ -311,12 +311,14 @@ nfd_nfkd(PyObject *input, int k)
stack[stackptr++] = *i++; stack[stackptr++] = *i++;
while(stackptr) { while(stackptr) {
Py_UNICODE code = stack[--stackptr]; Py_UNICODE code = stack[--stackptr];
if (!space) { /* Hangul Decomposition adds three characters in
space = PyString_GET_SIZE(result) + 10; a single step, so we need atleast that much room. */
if (PyUnicode_Resize(&result, space) == -1) if (space < 3) {
int newsize = PyString_GET_SIZE(result) + 10;
space += 10;
if (PyUnicode_Resize(&result, newsize) == -1)
return NULL; return NULL;
o = PyUnicode_AS_UNICODE(result) + space - 10; o = PyUnicode_AS_UNICODE(result) + newsize - space;
space = 10;
} }
/* Hangul Decomposition. */ /* Hangul Decomposition. */
if (SBase <= code && code < (SBase+SCount)) { if (SBase <= code && code < (SBase+SCount)) {