diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2014-09-11 07:57:13 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2014-09-11 07:57:13 (GMT) |
| commit | abf68ce16474a2d252723099f1c7a6d640191123 (patch) | |
| tree | 1300b07bd551a888966a4d2d77636dc68a540351 | |
| parent | 07940883796e71135723616f06a1405105c09571 (diff) | |
| download | cpython-abf68ce16474a2d252723099f1c7a6d640191123.zip cpython-abf68ce16474a2d252723099f1c7a6d640191123.tar.gz cpython-abf68ce16474a2d252723099f1c7a6d640191123.tar.bz2 | |
Issue #21951: Fixed a crash in Tkinter on AIX when called Tcl command with
empty string or tuple argument.
On some platforms Tcl memory allocator returns NULL when allocating zero-sized
block of memory.
| -rw-r--r-- | Lib/test/test_tcl.py | 3 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/_tkinter.c | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/Lib/test/test_tcl.py b/Lib/test/test_tcl.py index 7485e58..da8f629 100644 --- a/Lib/test/test_tcl.py +++ b/Lib/test/test_tcl.py @@ -416,7 +416,6 @@ class TclTest(unittest.TestCase): self.assertEqual(passValue((1, '2', (3.4,))), (1, '2', (3.4,)) if self.wantobjects else '1 2 3.4') - @unittest.skipIf(sys.platform.startswith("aix"), 'Issue #21951: crashes on AIX') def test_user_command(self): result = None def testfunc(arg): @@ -444,9 +443,11 @@ class TclTest(unittest.TestCase): check('string') check('string\xbd') check('string\u20ac') + check('') check(b'string', 'string') check(b'string\xe2\x82\xac', 'string\xe2\x82\xac') check(b'string\xbd', 'string\xbd') + check(b'', '') check('str\x00ing') check('str\x00ing\xbd') check('str\x00ing\u20ac') @@ -32,6 +32,9 @@ Core and Builtins Library ------- +- Issue #21951: Fixed a crash in Tkinter on AIX when called Tcl command with + empty string or tuple argument. + - Issue #21951: Tkinter now most likely raises MemoryError instead of crash if the memory allocation fails. diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c index 7871dec..6d777d3 100644 --- a/Modules/_tkinter.c +++ b/Modules/_tkinter.c @@ -899,6 +899,8 @@ AsObj(PyObject *value) Py_ssize_t size, i; size = PyTuple_Size(value); + if (size == 0) + return Tcl_NewListObj(0, NULL); if (!CHECK_SIZE(size, sizeof(Tcl_Obj *))) { PyErr_SetString(PyExc_OverflowError, "tuple is too long"); return NULL; @@ -925,6 +927,8 @@ AsObj(PyObject *value) inbuf = PyUnicode_DATA(value); size = PyUnicode_GET_LENGTH(value); + if (size == 0) + return Tcl_NewUnicodeObj((const void *)"", 0); if (!CHECK_SIZE(size, sizeof(Tcl_UniChar))) { PyErr_SetString(PyExc_OverflowError, "string is too long"); return NULL; |