summaryrefslogtreecommitdiffstats
path: root/generic/tclBinary.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2016-12-21 09:20:00 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2016-12-21 09:20:00 (GMT)
commita7951ab2ad1f03a9a2ab680ebd78ac7af913bbaf (patch)
treebf04d0673923fa02db65cbafb2399ac4f2d4ee3a /generic/tclBinary.c
parent89f9758279f36f87e7b7efa0c7b2358635a1ea10 (diff)
parentdd3012b0b5620ad001fc666e42e5bc27760fc514 (diff)
downloadtcl-a7951ab2ad1f03a9a2ab680ebd78ac7af913bbaf.zip
tcl-a7951ab2ad1f03a9a2ab680ebd78ac7af913bbaf.tar.gz
tcl-a7951ab2ad1f03a9a2ab680ebd78ac7af913bbaf.tar.bz2
Merge trunk
Diffstat (limited to 'generic/tclBinary.c')
-rw-r--r--generic/tclBinary.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/generic/tclBinary.c b/generic/tclBinary.c
index 5c5e86d..34c6e69 100644
--- a/generic/tclBinary.c
+++ b/generic/tclBinary.c
@@ -531,7 +531,8 @@ SetByteArrayFromAny(
Tcl_Interp *interp, /* Not used. */
Tcl_Obj *objPtr) /* The object to convert to type ByteArray. */
{
- int length, improper = 0;
+ size_t length;
+ int improper = 0;
const char *src, *srcEnd;
unsigned char *dst;
ByteArray *byteArrayPtr;
@@ -544,7 +545,8 @@ SetByteArrayFromAny(
return TCL_OK;
}
- src = TclGetStringFromObj(objPtr, &length);
+ src = TclGetString(objPtr);
+ length = objPtr->length;
srcEnd = src + length;
byteArrayPtr = ckalloc(BYTEARRAY_SIZE(length));