diff options
author | Benjamin Peterson <benjamin@python.org> | 2015-02-10 01:58:12 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2015-02-10 01:58:12 (GMT) |
commit | 8ce6806498be8aa8ae4bd3d3d83624766557ffad (patch) | |
tree | caebafee8484d324214281a56fb3c6cbbc469c26 /Modules/_winapi.c | |
parent | dee948b359c3a68ab4d6b81319eb2f3548b64c91 (diff) | |
download | cpython-8ce6806498be8aa8ae4bd3d3d83624766557ffad.zip cpython-8ce6806498be8aa8ae4bd3d3d83624766557ffad.tar.gz cpython-8ce6806498be8aa8ae4bd3d3d83624766557ffad.tar.bz2 |
add overflow checking (closes #23361)
Diffstat (limited to 'Modules/_winapi.c')
-rw-r--r-- | Modules/_winapi.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/Modules/_winapi.c b/Modules/_winapi.c index c53d55a..5257a1e 100644 --- a/Modules/_winapi.c +++ b/Modules/_winapi.c @@ -513,13 +513,23 @@ getenvironment(PyObject* environment) "environment can only contain strings"); goto error; } + if (totalsize > PY_SSIZE_T_MAX - PyUnicode_GET_LENGTH(key) - 1) { + PyErr_SetString(PyExc_OverflowError, "environment too long"); + goto error; + } totalsize += PyUnicode_GET_LENGTH(key) + 1; /* +1 for '=' */ + if (totalsize > PY_SSIZE_T_MAX - PyUnicode_GET_LENGTH(value) - 1) { + PyErr_SetString(PyExc_OverflowError, "environment too long"); + goto error; + } totalsize += PyUnicode_GET_LENGTH(value) + 1; /* +1 for '\0' */ } - buffer = PyMem_Malloc(totalsize * sizeof(Py_UCS4)); - if (! buffer) + buffer = PyMem_NEW(Py_UCS4, totalsize); + if (! buffer) { + PyErr_NoMemory(); goto error; + } p = buffer; end = buffer + totalsize; |