Fix bug #1301 -- a bad assert in _tkinter.
diff --git a/Misc/NEWS b/Misc/NEWS
index 97027a3..67af91e 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -157,6 +157,8 @@
Extension Modules
-----------------
+- Bug #1301: Bad assert in _tkinter fixed.
+
- Bug #1649098: Avoid declaration of zero-sized array declaration in
structure.
diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index 0b853b5..8a702d6 100644
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -936,10 +936,12 @@
/* This #ifdef assumes that Tcl uses UCS-2.
See TCL_UTF_MAX test above. */
#if defined(Py_UNICODE_WIDE) && TCL_UTF_MAX == 3
- Tcl_UniChar *outbuf;
+ Tcl_UniChar *outbuf = NULL;
Py_ssize_t i;
- assert(size < size * sizeof(Tcl_UniChar));
- outbuf = (Tcl_UniChar*)ckalloc(size * sizeof(Tcl_UniChar));
+ size_t allocsize = ((size_t)size) * sizeof(Tcl_UniChar);
+ if (allocsize >= size)
+ outbuf = (Tcl_UniChar*)ckalloc(allocsize);
+ /* Else overflow occurred, and we take the next exit */
if (!outbuf) {
PyErr_NoMemory();
return NULL;