diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2017-10-03 20:50:46 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2017-10-03 20:50:46 (GMT) |
| commit | a65b2420f681c45db43e94bfe3dc50ad1dfcd03d (patch) | |
| tree | 6f3b554982f61889a3a1049586c187bd3950a66f /Modules | |
| parent | fcc832a4fafcbbaca5484ed0274935e14c9dcf6b (diff) | |
| download | cpython-a65b2420f681c45db43e94bfe3dc50ad1dfcd03d.zip cpython-a65b2420f681c45db43e94bfe3dc50ad1dfcd03d.tar.gz cpython-a65b2420f681c45db43e94bfe3dc50ad1dfcd03d.tar.bz2 | |
[3.6] bpo-31675: Fix memory leaks in Tkinter's methods splitlist() and split() (GH-3866) (#3874)
when pass a string larger than 2 GiB.
Decrease memory requirements for Tcl's bigmem tests.
(cherry picked from commit 27c623c845dd6e4b8e1782666ca3a956636da266)
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_tkinter.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c index ef6f8bc..68ee26e 100644 --- a/Modules/_tkinter.c +++ b/Modules/_tkinter.c @@ -2291,7 +2291,11 @@ _tkinter_tkapp_splitlist(TkappObject *self, PyObject *arg) if (!PyArg_Parse(arg, "et:splitlist", "utf-8", &list)) return NULL; - CHECK_STRING_LENGTH(list); + if (strlen(list) >= INT_MAX) { + PyErr_SetString(PyExc_OverflowError, "string is too long"); + PyMem_Free(list); + return NULL; + } if (Tcl_SplitList(Tkapp_Interp(self), list, &argc, &argv) == TCL_ERROR) { PyMem_Free(list); @@ -2362,7 +2366,11 @@ _tkinter_tkapp_split(TkappObject *self, PyObject *arg) if (!PyArg_Parse(arg, "et:split", "utf-8", &list)) return NULL; - CHECK_STRING_LENGTH(list); + if (strlen(list) >= INT_MAX) { + PyErr_SetString(PyExc_OverflowError, "string is too long"); + PyMem_Free(list); + return NULL; + } v = Split(list); PyMem_Free(list); return v; |