summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-10-14 19:02:37 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-10-14 19:02:37 (GMT)
commitfe266ed796bfcc848b411947c9529c5eb683dd1f (patch)
treef84009e6cf8fbdf467b5b4ee68182626bfc7847f /generic
parent358e59a4d232f4b4eaa0fac600c24a915928aed1 (diff)
parentbd2bdd6f8a4571b486ba30fbf686af3eb82ee6bc (diff)
downloadtcl-fe266ed796bfcc848b411947c9529c5eb683dd1f.zip
tcl-fe266ed796bfcc848b411947c9529c5eb683dd1f.tar.gz
tcl-fe266ed796bfcc848b411947c9529c5eb683dd1f.tar.bz2
Bug 3576509: Better fix, which helps for all Tcl_DictObjGet() calls in Tcl's source code.
Diffstat (limited to 'generic')
-rw-r--r--generic/tclDictObj.c1
-rw-r--r--generic/tclEvent.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/generic/tclDictObj.c b/generic/tclDictObj.c
index 691fab9..b5c7ac0 100644
--- a/generic/tclDictObj.c
+++ b/generic/tclDictObj.c
@@ -954,6 +954,7 @@ Tcl_DictObjGet(
if (dictPtr->typePtr != &tclDictType) {
int result = SetDictFromAny(interp, dictPtr);
if (result != TCL_OK) {
+ *valuePtrPtr = NULL;
return result;
}
}
diff --git a/generic/tclEvent.c b/generic/tclEvent.c
index 0e15f71..0b585b6 100644
--- a/generic/tclEvent.c
+++ b/generic/tclEvent.c
@@ -312,7 +312,7 @@ TclDefaultBgErrorHandlerObjCmd(
int objc, /* Number of arguments. */
Tcl_Obj *const objv[]) /* Argument objects. */
{
- Tcl_Obj *keyPtr, *valuePtr = NULL;
+ Tcl_Obj *keyPtr, *valuePtr;
Tcl_Obj *tempObjv[2];
int code, level;
Tcl_InterpState saved;