diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2010-10-19 22:50:37 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2010-10-19 22:50:37 (GMT) |
| commit | 278b4c9ebf643183f815790c3c646b71937f8268 (patch) | |
| tree | 48ff659ae07503aceaa55c3c15cb6feee3d8e4c0 /generic/tclStringObj.c | |
| parent | 704a32619c8df8155c6706100c7b22190eb7e5b2 (diff) | |
| download | tcl-278b4c9ebf643183f815790c3c646b71937f8268.zip tcl-278b4c9ebf643183f815790c3c646b71937f8268.tar.gz tcl-278b4c9ebf643183f815790c3c646b71937f8268.tar.bz2 | |
* generic/tclZlib.c (Tcl_ZlibStreamGet): [Bug 3081008]: Ensure that
when a bytearray gets its internals entangled with zlib for more than
a passing moment, that bytearray will never be shimmered away. This
increases the amount of copying but is simple to get right, which is a
reasonable trade-off.
* generic/tclStringObj.c (Tcl_AppendObjToObj): Added some special
cases so that most of the time when you build up a bytearray by
appending, it actually ends up being a bytearray rather than
shimmering back and forth to string.
* tests/http11.test (check_crc): Use a simpler way to express the
functionality of this procedure.
Diffstat (limited to 'generic/tclStringObj.c')
| -rw-r--r-- | generic/tclStringObj.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c index 9e2e3aa..96e01d0 100644 --- a/generic/tclStringObj.c +++ b/generic/tclStringObj.c @@ -33,7 +33,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclStringObj.c,v 1.137 2010/04/30 20:52:51 dgp Exp $ */ + * RCS: @(#) $Id: tclStringObj.c,v 1.138 2010/10/19 22:50:37 dkf Exp $ */ #include "tclInt.h" #include "tommath.h" @@ -1228,13 +1228,23 @@ Tcl_AppendObjToObj( const char *bytes; /* + * Special case: second object is standard-empty is fast case. We know + * that appending nothing to anything leaves that starting anything... + */ + + if (appendObjPtr->bytes == tclEmptyStringRep) { + return; + } + + /* * Handle append of one bytearray object to another as a special case. * Note that we only do this when the objects don't have string reps; if * it did, then appending the byte arrays together could well lose * information; this is a special-case optimization only. */ - if (TclIsPureByteArray(objPtr) && TclIsPureByteArray(appendObjPtr)) { + if ((TclIsPureByteArray(objPtr) || objPtr->bytes == tclEmptyStringRep) + && TclIsPureByteArray(appendObjPtr)) { unsigned char *bytesSrc; int lengthSrc, lengthTotal; |