diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2010-02-24 14:30:31 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2010-02-24 14:30:31 (GMT) |
| commit | 96d071af5418655b8dfbecd0410b6e5d07bfbde5 (patch) | |
| tree | 02ebdf02ca154c666a08cbc7e9b057a16e1dc918 /generic/tclListObj.c | |
| parent | 3201edaaf6efa495d6e2c747817da9ba884a8be5 (diff) | |
| download | tcl-96d071af5418655b8dfbecd0410b6e5d07bfbde5.zip tcl-96d071af5418655b8dfbecd0410b6e5d07bfbde5.tar.gz tcl-96d071af5418655b8dfbecd0410b6e5d07bfbde5.tar.bz2 | |
Fix some nasties with handling duplicate keys in list->dict->list conversions.
Diffstat (limited to 'generic/tclListObj.c')
| -rw-r--r-- | generic/tclListObj.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/generic/tclListObj.c b/generic/tclListObj.c index 659017c..896dcd3 100644 --- a/generic/tclListObj.c +++ b/generic/tclListObj.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclListObj.c,v 1.58 2009/09/30 03:11:26 dgp Exp $ + * RCS: @(#) $Id: tclListObj.c,v 1.59 2010/02/24 14:30:34 dkf Exp $ */ #include "tclInt.h" @@ -1684,10 +1684,12 @@ SetListFromAny( /* * Dictionaries are a special case; they have a string representation such * that *all* valid dictionaries are valid lists. Hence we can convert - * more directly. + * more directly. Only do this when there's no existing string rep; if + * there is, it is the string rep that's authoritative (because it could + * describe duplicate keys). */ - if (objPtr->typePtr == &tclDictType) { + if (objPtr->typePtr == &tclDictType && !objPtr->bytes) { Tcl_Obj *keyPtr, *valuePtr; Tcl_DictSearch search; int done, size; |