diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-07-04 11:41:41 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-07-04 11:41:41 (GMT) |
| commit | 64a63fa7c5594097d782968787ad37e46f9e4f5e (patch) | |
| tree | e0e97bd67659a27c11df2bc8157f8859629ec509 /generic/tclBinary.c | |
| parent | c053495b3e85c92d11d50b3cbafb83cd0fac99e5 (diff) | |
| parent | 62f9be3bc246d8af459066978a4ee75d0ff10d88 (diff) | |
| download | tcl-64a63fa7c5594097d782968787ad37e46f9e4f5e.zip tcl-64a63fa7c5594097d782968787ad37e46f9e4f5e.tar.gz tcl-64a63fa7c5594097d782968787ad37e46f9e4f5e.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic/tclBinary.c')
| -rw-r--r-- | generic/tclBinary.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/generic/tclBinary.c b/generic/tclBinary.c index 5678a66..bf40924 100644 --- a/generic/tclBinary.c +++ b/generic/tclBinary.c @@ -556,12 +556,8 @@ TclGetByteArrayFromObj( baPtr = GET_BYTEARRAY(irPtr); if (numBytesPtr != NULL) { -#if TCL_MAJOR_VERSION > 8 - *numBytesPtr = baPtr->used; -#else - /* TODO: What's going on here? Document or eliminate. */ + /* Make sure we return a value between 0 and UINT_MAX-1, or (size_t)-1 */ *numBytesPtr = ((size_t)(unsigned int)(baPtr->used + 1)) - 1; -#endif } return baPtr->bytes; } |