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

bpo-15954: Check return code of wcsxfrm(). (#508)

This commit is contained in:
Serhiy Storchaka 2017-03-06 21:21:41 +02:00 committed by GitHub
parent d908fd9ee1
commit be487a65f1
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Modules/_localemodule.c
View File

@ -260,7 +260,12 @@ PyLocale_strxfrm(PyObject* self, PyObject* args)
PyErr_NoMemory(); PyErr_NoMemory();
goto exit; goto exit;
} }
errno = 0;
n2 = wcsxfrm(buf, s, n1); n2 = wcsxfrm(buf, s, n1);
if (errno) {
PyErr_SetFromErrno(PyExc_OSError);
goto exit;
}
if (n2 >= (size_t)n1) { if (n2 >= (size_t)n1) {
/* more space needed */ /* more space needed */
wchar_t * new_buf = PyMem_Realloc(buf, (n2+1)*sizeof(wchar_t)); wchar_t * new_buf = PyMem_Realloc(buf, (n2+1)*sizeof(wchar_t));
@ -269,14 +274,17 @@ PyLocale_strxfrm(PyObject* self, PyObject* args)
goto exit; goto exit;
} }
buf = new_buf; buf = new_buf;
errno = 0;
n2 = wcsxfrm(buf, s, n2+1); n2 = wcsxfrm(buf, s, n2+1);
if (errno) {
PyErr_SetFromErrno(PyExc_OSError);
goto exit;
}
} }
result = PyUnicode_FromWideChar(buf, n2); result = PyUnicode_FromWideChar(buf, n2);
exit: exit:
if (buf) PyMem_Free(buf);
PyMem_Free(buf); PyMem_Free(s);
if (s)
PyMem_Free(s);
return result; return result;
} }
#endif #endif