diff options
| author | dgp <dgp@users.sourceforge.net> | 2017-05-08 16:07:58 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2017-05-08 16:07:58 (GMT) |
| commit | c9d16daf31e8306b115e3415f1ef5c6f9097ee2f (patch) | |
| tree | 06be1b318fcd237abc980b74082a6a8bed04175a /generic | |
| parent | 1dd9e5410409e738a9965f15b8d2bbe397438345 (diff) | |
| parent | 509ac989d9ace73fcc8da899b7ea70fc3bd8c1d7 (diff) | |
| download | tcl-c9d16daf31e8306b115e3415f1ef5c6f9097ee2f.zip tcl-c9d16daf31e8306b115e3415f1ef5c6f9097ee2f.tar.gz tcl-c9d16daf31e8306b115e3415f1ef5c6f9097ee2f.tar.bz2 | |
Merge 8.6; update changes.
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclBinary.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/generic/tclBinary.c b/generic/tclBinary.c index 981f174..2a4fd84 100644 --- a/generic/tclBinary.c +++ b/generic/tclBinary.c @@ -1653,7 +1653,15 @@ GetFormatSpec( (*formatPtr)++; *countPtr = BINARY_ALL; } else if (isdigit(UCHAR(**formatPtr))) { /* INTL: digit */ - *countPtr = strtoul(*formatPtr, (char **) formatPtr, 10); + unsigned long int count; + + errno = 0; + count = strtoul(*formatPtr, (char **) formatPtr, 10); + if (errno || (count > (unsigned long) INT_MAX)) { + *countPtr = INT_MAX; + } else { + *countPtr = (int) count; + } } else { *countPtr = BINARY_NOCOUNT; } |