traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix bug #1301 -- a bad assert in _tkinter.

This commit is contained in:
Guido van Rossum 2008-01-03 23:52:04 +00:00
parent 6df9a82bd3
commit 3b4a5bd9da
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS
View File

@ -157,6 +157,8 @@ Library
Extension Modules
-----------------
- Bug #1301: Bad assert in _tkinter fixed.
- Bug #1649098: Avoid declaration of zero-sized array declaration in
structure.

8
Modules/_tkinter.c
View File

@ -936,10 +936,12 @@ AsObj(PyObject *value)
/* 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;