diff options
| author | dgp <dgp@users.sourceforge.net> | 2016-12-23 15:21:22 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2016-12-23 15:21:22 (GMT) |
| commit | ee6c9c9f00f18fb8ae94d73f22e69ca270d4d7d8 (patch) | |
| tree | 030ee9cf12979f70eb1ad6b6b4a9f837d16df58e /generic/tclBinary.c | |
| parent | bc213f0ba3bb7a24f5590a18ac322b79c04a9b99 (diff) | |
| parent | f256ed021d99bae8aba1ef9b86f347f91d5e6574 (diff) | |
| download | tcl-ee6c9c9f00f18fb8ae94d73f22e69ca270d4d7d8.zip tcl-ee6c9c9f00f18fb8ae94d73f22e69ca270d4d7d8.tar.gz tcl-ee6c9c9f00f18fb8ae94d73f22e69ca270d4d7d8.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic/tclBinary.c')
| -rw-r--r-- | generic/tclBinary.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/generic/tclBinary.c b/generic/tclBinary.c index 1576752..6369a86 100644 --- a/generic/tclBinary.c +++ b/generic/tclBinary.c @@ -555,7 +555,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; @@ -568,7 +569,8 @@ SetByteArrayFromAny( return TCL_OK; } - src = TclGetStringFromObj(objPtr, &length); + src = TclGetString(objPtr); + length = objPtr->length; srcEnd = src + length; byteArrayPtr = ckalloc(BYTEARRAY_SIZE(length)); |