Issue #20515: Fix NULL pointer dereference introduced by issue #20368

CID 1167595
This commit is contained in:
Christian Heimes 2014-02-05 00:29:48 +01:00
commit 25ff287dd7
2 changed files with 5 additions and 0 deletions

View File

@ -24,6 +24,8 @@ Core and Builtins
Library Library
------- -------
- Issue #20515: Fix NULL pointer dereference introduced by issue #20368.
- Issue #19186: Restore namespacing of expat symbols inside the pyexpat module. - Issue #19186: Restore namespacing of expat symbols inside the pyexpat module.
- Issue #20053: ensurepip (and hence venv) are no longer affected by the - Issue #20053: ensurepip (and hence venv) are no longer affected by the

View File

@ -1397,6 +1397,9 @@ varname_converter(PyObject *in, void *_out)
if (PyUnicode_Check(in)) { if (PyUnicode_Check(in)) {
Py_ssize_t size; Py_ssize_t size;
s = PyUnicode_AsUTF8AndSize(in, &size); s = PyUnicode_AsUTF8AndSize(in, &size);
if (s == NULL) {
return 0;
}
if (size > INT_MAX) { if (size > INT_MAX) {
PyErr_SetString(PyExc_OverflowError, "string is too long"); PyErr_SetString(PyExc_OverflowError, "string is too long");
return 0; return 0;