1 files changed, 12 insertions, 0 deletions
diff --git a/generic/tclStrToD.c b/generic/tclStrToD.c
index 6da6df3..ed2e80f 100644
--- a/generic/tclStrToD.c
+++ b/generic/tclStrToD.c
@@ -546,6 +546,18 @@ TclParseNumber(
      */
 
     if (bytes == NULL) {
+	if (objPtr->typePtr == &tclDictType) {
+	    /* A dict can never be a (single) number */
+	    return TCL_ERROR;
+	}
+	if (objPtr->typePtr == &tclListType) {
+	    int length;
+	    /* A list can only be a (single) number if its length == 1 */
+	    TclListObjLength(NULL, objPtr, &length);
+	    if (length != 1) {
+		return TCL_ERROR;
+	    }
+	}
 	bytes = TclGetString(objPtr);
     }