diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-07-06 09:23:09 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-07-06 09:23:09 (GMT) |
| commit | b294401d2f8ccdb83c4f030d41ecab1e4eac11d4 (patch) | |
| tree | b1ac03bf9f3d05e5b9cc99794ede4e2521ef08e6 /generic/tclBinary.c | |
| parent | d1f3e49057fa7688586babd4b53652f22e479ff6 (diff) | |
| parent | 841ec05ecc0bb62728af6c92deba9d2a5721d5c6 (diff) | |
| download | tcl-b294401d2f8ccdb83c4f030d41ecab1e4eac11d4.zip tcl-b294401d2f8ccdb83c4f030d41ecab1e4eac11d4.tar.gz tcl-b294401d2f8ccdb83c4f030d41ecab1e4eac11d4.tar.bz2 | |
merge novem
Diffstat (limited to 'generic/tclBinary.c')
| -rw-r--r-- | generic/tclBinary.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tclBinary.c b/generic/tclBinary.c index b9460f2..bd78e89 100644 --- a/generic/tclBinary.c +++ b/generic/tclBinary.c @@ -648,7 +648,7 @@ TclAppendBytesToByteArray( } byteArrayPtr = GET_BYTEARRAY(objPtr); - if (len > INT_MAX - byteArrayPtr->used) { + if (len + byteArrayPtr->used > UINT_MAX) { Tcl_Panic("max size for a Tcl value (%d bytes) exceeded", INT_MAX); } @@ -685,7 +685,7 @@ TclAppendBytesToByteArray( SET_BYTEARRAY(objPtr, byteArrayPtr); } - if (bytes && (len > 0) && (len != (size_t)-1)) { + if (bytes) { memcpy(byteArrayPtr->bytes + byteArrayPtr->used, bytes, len); } byteArrayPtr->used += len; |