summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2002-03-20 02:59:30 (GMT)
committerhobbs <hobbs>2002-03-20 02:59:30 (GMT)
commitccbffd0e25dc9ee8600eee53815af75be7268a05 (patch)
tree4b21d7de214458ffcc2004c9cc396ffd8c10a10c
parent8e76029e6a388b7b540e35e72f4c7926e53c7827 (diff)
downloadtk-ccbffd0e25dc9ee8600eee53815af75be7268a05.zip
tk-ccbffd0e25dc9ee8600eee53815af75be7268a05.tar.gz
tk-ccbffd0e25dc9ee8600eee53815af75be7268a05.tar.bz2
* generic/tkOldConfig.c (Tk_ConfigureValue): prevent leaving
interp->result as NULL.
-rw-r--r--ChangeLog5
-rw-r--r--generic/tkOldConfig.c8
2 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fe1e050..d63696b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-19 Jeff Hobbs <jeffh@ActiveState.com>
+
+ * generic/tkOldConfig.c (Tk_ConfigureValue): prevent leaving
+ interp->result as NULL.
+
2002-03-07 Donal K. Fellows <fellowsd@cs.man.ac.uk>
* library/text.tcl (TextPasteSelection): Renaming of TextPaste to
diff --git a/generic/tkOldConfig.c b/generic/tkOldConfig.c
index 1f206fb..86bb5ff 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.10 2002/01/25 21:09:37 dgp Exp $
+ * RCS: @(#) $Id: tkOldConfig.c,v 1.11 2002/03/20 02:59:30 hobbs Exp $
*/
#include "tkPort.h"
@@ -941,6 +941,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;
}