diff options
| author | dgp <dgp@users.sourceforge.net> | 2017-05-08 16:14:10 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2017-05-08 16:14:10 (GMT) |
| commit | b43317470fd3fa1075c53572a0b046f1fed841cc (patch) | |
| tree | c726fd889dd910320aa42ffefd5165ad7542926b /generic/tclBinary.c | |
| parent | 15d59c260d8534556ec857cd2acfc8e0c4c7e934 (diff) | |
| parent | 435fd1ab8b987021ad8a7220a1f4fc89c3a4c872 (diff) | |
| download | tcl-b43317470fd3fa1075c53572a0b046f1fed841cc.zip tcl-b43317470fd3fa1075c53572a0b046f1fed841cc.tar.gz tcl-b43317470fd3fa1075c53572a0b046f1fed841cc.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic/tclBinary.c')
| -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 d0066e5..03ba383 100644 --- a/generic/tclBinary.c +++ b/generic/tclBinary.c @@ -1796,7 +1796,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; } |