summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2002-03-20 02:58:35 (GMT)
committerhobbs <hobbs>2002-03-20 02:58:35 (GMT)
commitd5213eda054ba4ef215ecc6a6bedc9a52f65992e (patch)
tree35489ab42a28fa0ae5f3dbf3cd01076c5ba04f0e
parent03871e2f775176486ca0290ae40b1d053d839019 (diff)
downloadtk-d5213eda054ba4ef215ecc6a6bedc9a52f65992e.zip
tk-d5213eda054ba4ef215ecc6a6bedc9a52f65992e.tar.gz
tk-d5213eda054ba4ef215ecc6a6bedc9a52f65992e.tar.bz2
* generic/tkOldConfig.c (Tk_ConfigureValue): prevent leaving
interp->result as NULL.
-rw-r--r--ChangeLog9
-rw-r--r--generic/tkOldConfig.c8
2 files changed, 14 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 91fc5ba..342d674 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,12 @@
+2002-03-19 Jeff Hobbs <jeffh@ActiveState.com>
+
+ * generic/tkOldConfig.c (Tk_ConfigureValue): prevent leaving
+ interp->result as NULL.
+
2002-02-28 Don Porter <dgp@users.sourceforge.net>
- * library/console.tcl (tkConsoleBind): Corrected console <<Paste>>
- binding on Unix platforms.
+ * library/console.tcl (tkConsoleBind): Corrected console <<Paste>>
+ binding on Unix platforms.
2002-02-25 Jeff Hobbs <jeffh@ActiveState.com>
diff --git a/generic/tkOldConfig.c b/generic/tkOldConfig.c
index 9ee2a14..b53eee2 100644
--- a/generic/tkOldConfig.c
+++ b/generic/tkOldConfig.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkOldConfig.c,v 1.6 2000/03/07 00:09:08 ericm Exp $
+ * RCS: @(#) $Id: tkOldConfig.c,v 1.6.2.1 2002/03/20 02:58:35 hobbs Exp $
*/
#include "tkPort.h"
@@ -940,6 +940,12 @@ Tk_ConfigureValue(interp, tkwin, specs, widgRec, argvName, flags)
}
interp->result = FormatConfigValue(interp, tkwin, specPtr, widgRec,
interp->result, &interp->freeProc);
+ /*
+ * Don't let the interp->result be NULL.
+ */
+ if (interp->result == NULL) {
+ interp->result = "";
+ }
return TCL_OK;
}