Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

merge 3.3 (#23367)

This commit is contained in:
Benjamin Peterson 2015-03-02 11:18:40 -05:00
parent 3f9e381030 b779bfba45
commit 5061e67f0f
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS
View File

@ -53,6 +53,8 @@ Library
- Issue #23421: Fixed compression in tarfile CLI. Patch by wdv4758h. - Issue #23421: Fixed compression in tarfile CLI. Patch by wdv4758h.
- Issue #23367: Fix possible overflows in the unicodedata module.
- Issue #23361: Fix possible overflow in Windows subprocess creation code. - Issue #23361: Fix possible overflow in Windows subprocess creation code.
Build Build

13
Modules/unicodedata.c
View File

@ -553,10 +553,17 @@ nfd_nfkd(PyObject *self, PyObject *input, int k)
stackptr = 0; stackptr = 0;
isize = PyUnicode_GET_LENGTH(input); isize = PyUnicode_GET_LENGTH(input);
space = isize;
/* Overallocate at most 10 characters. */ /* Overallocate at most 10 characters. */
space = (isize > 10 ? 10 : isize) + isize; if (space > 10) {
if (space <= PY_SSIZE_T_MAX - 10)
space += 10;
}
else {
space *= 2;
}
osize = space; osize = space;
output = PyMem_New(Py_UCS4, space); output = PyMem_NEW(Py_UCS4, space);
if (!output) { if (!output) {
PyErr_NoMemory(); PyErr_NoMemory();
return NULL; return NULL;
@ -703,7 +710,7 @@ nfc_nfkc(PyObject *self, PyObject *input, int k)
/* We allocate a buffer for the output. /* We allocate a buffer for the output.
If we find that we made no changes, we still return If we find that we made no changes, we still return
the NFD result. */ the NFD result. */
output = PyMem_New(Py_UCS4, len); output = PyMem_NEW(Py_UCS4, len);
if (!output) { if (!output) {
PyErr_NoMemory(); PyErr_NoMemory();
Py_DECREF(result); Py_DECREF(result);