diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-11-17 11:27:13 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-11-17 11:27:13 (GMT) |
| commit | a27501598a341435dbc5b32bbbfb3635aebff956 (patch) | |
| tree | 3ce1d60f74e3c947e5a6aac865eb48d9dde0f6d4 /generic/tclDictObj.c | |
| parent | 5560b9198b6cdd785cf9d82301a7fff87c0c8c1f (diff) | |
| parent | 24d7fa64015b310278717d5f2462d84b7f7cd124 (diff) | |
| download | tcl-a27501598a341435dbc5b32bbbfb3635aebff956.zip tcl-a27501598a341435dbc5b32bbbfb3635aebff956.tar.gz tcl-a27501598a341435dbc5b32bbbfb3635aebff956.tar.bz2 | |
merge core-8-6-branch
Diffstat (limited to 'generic/tclDictObj.c')
| -rw-r--r-- | generic/tclDictObj.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/generic/tclDictObj.c b/generic/tclDictObj.c index d15255f..2eff1ff 100644 --- a/generic/tclDictObj.c +++ b/generic/tclDictObj.c @@ -487,15 +487,14 @@ static void UpdateStringOfDict( Tcl_Obj *dictPtr) { -#define LOCAL_SIZE 20 - int localFlags[LOCAL_SIZE], *flagPtr = NULL; +#define LOCAL_SIZE 64 + char localFlags[LOCAL_SIZE], *flagPtr = NULL; Dict *dict = DICT(dictPtr); ChainEntry *cPtr; Tcl_Obj *keyPtr, *valuePtr; int i, length, bytesNeeded = 0; const char *elem; char *dst; - const int maxFlags = UINT_MAX / sizeof(int); /* * This field is the most useful one in the whole hash structure, and it @@ -517,10 +516,8 @@ UpdateStringOfDict( if (numElems <= LOCAL_SIZE) { flagPtr = localFlags; - } else if (numElems > maxFlags) { - Tcl_Panic("max size for a Tcl value (%d bytes) exceeded", INT_MAX); } else { - flagPtr = ckalloc(numElems * sizeof(int)); + flagPtr = ckalloc(numElems); } for (i=0,cPtr=dict->entryChainHead; i<numElems; i+=2,cPtr=cPtr->nextPtr) { /* |