diff options
| author | ferrieux <ferrieux@users.sourceforge.net> | 2010-05-19 21:47:48 (GMT) |
|---|---|---|
| committer | ferrieux <ferrieux@users.sourceforge.net> | 2010-05-19 21:47:48 (GMT) |
| commit | 7e4239c1ba238f258459935867402e007325bc32 (patch) | |
| tree | cbf09fc66c588b10af9bf71a9241ab17bdb5176f /generic/tclDictObj.c | |
| parent | ce9483a5bd1885e47f7f2ab67a2c947736fd7c3d (diff) | |
| download | tcl-7e4239c1ba238f258459935867402e007325bc32.zip tcl-7e4239c1ba238f258459935867402e007325bc32.tar.gz tcl-7e4239c1ba238f258459935867402e007325bc32.tar.bz2 | |
Backport of fix for [Bug 3004007], EIAS violation in list-dict conversions.
Diffstat (limited to 'generic/tclDictObj.c')
| -rw-r--r-- | generic/tclDictObj.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/generic/tclDictObj.c b/generic/tclDictObj.c index d66a9b7..bf10967 100644 --- a/generic/tclDictObj.c +++ b/generic/tclDictObj.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclDictObj.c,v 1.56.2.3 2009/10/08 14:42:40 dkf Exp $ + * RCS: @(#) $Id: tclDictObj.c,v 1.56.2.4 2010/05/19 21:47:49 ferrieux Exp $ */ #include "tclInt.h" @@ -602,6 +602,14 @@ SetDictFromAny( if (!isNew) { Tcl_Obj *discardedValue = Tcl_GetHashValue(hPtr); + /* + * Not really a well-formed dictionary as there are duplicate + * keys, so better get the string rep here so that we can + * convert back. + */ + + (void) Tcl_GetString(objPtr); + TclDecrRefCount(discardedValue); } Tcl_SetHashValue(hPtr, objv[i+1]); |