summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2003-07-16 22:54:26 (GMT)
committerhobbs <hobbs>2003-07-16 22:54:26 (GMT)
commitaa5738dd765124fc5c414ef6e0a7cded389065f6 (patch)
treec46d3547fc6ffb6537a96bc707397632b81a8b8d
parenta3adb9336dab770f2641c314cd159bf23aee6882 (diff)
downloadtk-aa5738dd765124fc5c414ef6e0a7cded389065f6.zip
tk-aa5738dd765124fc5c414ef6e0a7cded389065f6.tar.gz
tk-aa5738dd765124fc5c414ef6e0a7cded389065f6.tar.bz2
* generic/tkWindow.c (Initialize): do not free uninit'ed dstring.
[Bug 755906] (mistachkin)
-rw-r--r--ChangeLog5
-rw-r--r--generic/tkWindow.c3
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c177340..20c07a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-16 Jeff Hobbs <jeffh@ActiveState.com>
+
+ * generic/tkWindow.c (Initialize): do not free uninit'ed dstring.
+ [Bug 755906] (mistachkin)
+
2003-07-15 Mo DeJong <mdejong@users.sourceforge.net>
* unix/tkUnixEvent.c (TkpCloseDisplay): Don't
diff --git a/generic/tkWindow.c b/generic/tkWindow.c
index c1e6499..4fc47fd 100644
--- a/generic/tkWindow.c
+++ b/generic/tkWindow.c
@@ -12,7 +12,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkWindow.c,v 1.56 2003/01/28 20:39:17 jenglish Exp $
+ * RCS: @(#) $Id: tkWindow.c,v 1.56.2.1 2003/07/16 22:54:26 hobbs Exp $
*/
#include "tkPort.h"
@@ -2953,7 +2953,6 @@ Initialize(interp)
while (1) {
master = Tcl_GetMaster(master);
if (master == NULL) {
- Tcl_DStringFree(&ds);
Tcl_AppendResult(interp, "NULL master", (char *) NULL);
Tcl_MutexUnlock(&windowMutex);
return TCL_ERROR;