diff options
| author | andreas_kupries <akupries@shaw.ca> | 2008-05-23 21:10:42 (GMT) |
|---|---|---|
| committer | andreas_kupries <akupries@shaw.ca> | 2008-05-23 21:10:42 (GMT) |
| commit | 882f2ac2e6ddf2541a019c7f411e1959ef9cb221 (patch) | |
| tree | 008b4e00f3373b12ca8d0fb9578241be69a6f541 /generic/tclIO.c | |
| parent | bfa75a0049382386cd2754f86e14d3c9f4177db4 (diff) | |
| download | tcl-882f2ac2e6ddf2541a019c7f411e1959ef9cb221.zip tcl-882f2ac2e6ddf2541a019c7f411e1959ef9cb221.tar.gz tcl-882f2ac2e6ddf2541a019c7f411e1959ef9cb221.tar.bz2 | |
* win/tclWinChan.c (FileWideSeekProc): Accepted a patch by
Alexandre Ferrieux <ferrieux@users.sourceforge.net> to fix the
[Bug 1965787]. 'tell' now works for locations > 2 GB as well
instead of going negative.
* generic/tclIO.c (Tcl_SetChannelBufferSize): Accepted a patch by
* tests/io.test: Alexandre Ferrieux <ferrieux@users.sourceforge.net>
* tests/chanio.test: to fix the [Bug 1969953]. Buffersize outside
of the supported range are now clipped to nearest boundary instead
of ignored.
Diffstat (limited to 'generic/tclIO.c')
| -rw-r--r-- | generic/tclIO.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/generic/tclIO.c b/generic/tclIO.c index 6de2cbe..b30385f 100644 --- a/generic/tclIO.c +++ b/generic/tclIO.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclIO.c,v 1.137.2.5 2008/04/15 18:32:01 andreas_kupries Exp $ + * RCS: @(#) $Id: tclIO.c,v 1.137.2.6 2008/05/23 21:10:43 andreas_kupries Exp $ */ #include "tclInt.h" @@ -224,6 +224,8 @@ static Tcl_ObjType tclChannelType = { #define BUSY_STATE(st,fl) \ ((((st)->csPtrR) && ((fl) & TCL_READABLE)) || \ (((st)->csPtrW) && ((fl) & TCL_WRITABLE))) + +#define MAX_CHANNEL_BUFFER_SIZE (1024*1024) /* *--------------------------------------------------------------------------- @@ -6937,12 +6939,13 @@ Tcl_SetChannelBufferSize( ChannelState *statePtr; /* State of real channel structure. */ /* - * If the buffer size is smaller than 1 byte or larger than one MByte, do - * not accept the requested size and leave the current buffer size. + * Clip the buffer size to force it into the [1,1M] range */ - if (sz < 1 || sz > 1024*1024) { - return; + if (sz < 1) { + sz = 1; + } else if (sz > MAX_CHANNEL_BUFFER_SIZE) { + sz = MAX_CHANNEL_BUFFER_SIZE; } statePtr = ((Channel *) chan)->state; |