mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-24 18:55:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

bpo-36301: Error if decoding pybuilddir.txt fails (GH-12422)

Browse source 
Python initialization now fails if decoding pybuilddir.txt
configuration file fails at startup.

_PyPathConfig_Calculate() now reports memory allocation failure and
decoding error on decoding pybuilddir.txt content from
UTF-8/surrogateescape.
This commit is contained in:
Victor Stinner 2019-03-19 01:46:25 +01:00 • committed by GitHub
parent 7b14f0c02c
commit 5f9cf23502
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 32 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Objects/unicodeobject.c
View file

@ -5064,12 +5064,21 @@ _Py_DecodeUTF8Ex(const char *s, Py_ssize_t size, wchar_t **wstr, size_t *wlen,
return 0;
}
wchar_t*
_Py_DecodeUTF8_surrogateescape(const char *arg, Py_ssize_t arglen)
_Py_DecodeUTF8_surrogateescape(const char *arg, Py_ssize_t arglen,
size_t *wlen)
{
wchar_t *wstr;
int res = _Py_DecodeUTF8Ex(arg, arglen, &wstr, NULL, NULL, 1);
int res = _Py_DecodeUTF8Ex(arg, arglen,
&wstr, wlen,
NULL, _Py_ERROR_SURROGATEESCAPE);
if (res != 0) {
/* _Py_DecodeUTF8Ex() must support _Py_ERROR_SURROGATEESCAPE */
assert(res != -3);
if (wlen) {
*wlen = (size_t)res;
}
return NULL;
}
return wstr;