diff options
| author | nijtmans@users.sourceforge.net <jan.nijtmans> | 2012-09-19 14:50:11 (GMT) |
|---|---|---|
| committer | nijtmans@users.sourceforge.net <jan.nijtmans> | 2012-09-19 14:50:11 (GMT) |
| commit | 8903874c427af94569a728c6ac5c770c43549203 (patch) | |
| tree | b1a93c9472066ad889bb814aa68d0b255123be23 /generic/tclBinary.c | |
| parent | 5ad5db44171a6ac5e6de273b04687063616ed1af (diff) | |
| parent | 3de19b0f651a225ea6b2189d0c61fbb227c9f89e (diff) | |
| download | tcl-8903874c427af94569a728c6ac5c770c43549203.zip tcl-8903874c427af94569a728c6ac5c770c43549203.tar.gz tcl-8903874c427af94569a728c6ac5c770c43549203.tar.bz2 | |
merge trunk
<p>change dde version to 1.4.0b2
Diffstat (limited to 'generic/tclBinary.c')
| -rw-r--r-- | generic/tclBinary.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/generic/tclBinary.c b/generic/tclBinary.c index a1e836e..3d8b24c 100644 --- a/generic/tclBinary.c +++ b/generic/tclBinary.c @@ -303,18 +303,16 @@ Tcl_SetByteArrayObj( TclFreeIntRep(objPtr); Tcl_InvalidateStringRep(objPtr); - length = (length < 0) ? 0 : length; + if (length < 0) { + length = 0; + } byteArrayPtr = ckalloc(BYTEARRAY_SIZE(length)); byteArrayPtr->used = length; byteArrayPtr->allocated = length; - if (length) { - if (bytes) { - memcpy(byteArrayPtr->bytes, bytes, (size_t) length); - } else { - memset(byteArrayPtr->bytes, 0, (size_t) length); - } - } + if ((bytes != NULL) && (length > 0)) { + memcpy(byteArrayPtr->bytes, bytes, (size_t) length); + } objPtr->typePtr = &tclByteArrayType; SET_BYTEARRAY(objPtr, byteArrayPtr); } |