diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-09-19 14:50:11 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-09-19 14:50:11 (GMT) |
| commit | c57eb3c77c77749299dfec90a74977fa9c5c559b (patch) | |
| tree | b1a93c9472066ad889bb814aa68d0b255123be23 /generic/tclBinary.c | |
| parent | bd029b94a1f825a22bf635e4c255406562741d5b (diff) | |
| parent | 562176ad5a881a5f92f2985feab5401c375d559a (diff) | |
| download | tcl-frq_3527238.zip tcl-frq_3527238.tar.gz tcl-frq_3527238.tar.bz2 | |
merge trunkfrq_3527238
<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); } |