summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorandreas_kupries <akupries@shaw.ca>2008-04-09 18:37:08 (GMT)
committerandreas_kupries <akupries@shaw.ca>2008-04-09 18:37:08 (GMT)
commit9bb2ff4b525caf08e3d48cadac6631b5693687aa (patch)
tree14005dcd3edeb271e777161dca86672a240587e2 /generic
parentdc2f74c6070596e4d5a19fbf284d1c20d447453a (diff)
downloadtcl-9bb2ff4b525caf08e3d48cadac6631b5693687aa.zip
tcl-9bb2ff4b525caf08e3d48cadac6631b5693687aa.tar.gz
tcl-9bb2ff4b525caf08e3d48cadac6631b5693687aa.tar.bz2
* generic/tclIOCmd.c (Tcl_FcopyObjCmd): Added checking of -size
* tests/ioCmd.test (iocmd-15.{13,14}): value to reject negative values, and values overflowing 32-bit signed. [Bug 1557855]. Basic patch by Alexandre Ferrieux <ferrieux@users.sourceforge.net>, with modifications from me to separate overflow from true negative value. Extended testsuite.
Diffstat (limited to 'generic')
-rw-r--r--generic/tclIOCmd.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/generic/tclIOCmd.c b/generic/tclIOCmd.c
index c1abee1..04c7c3c 100644
--- a/generic/tclIOCmd.c
+++ b/generic/tclIOCmd.c
@@ -8,7 +8,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclIOCmd.c,v 1.51 2007/12/13 15:23:18 dgp Exp $
+ * RCS: @(#) $Id: tclIOCmd.c,v 1.52 2008/04/09 18:37:08 andreas_kupries Exp $
*/
#include "tclInt.h"
@@ -1643,6 +1643,20 @@ Tcl_FcopyObjCmd(
if (TclGetIntFromObj(interp, objv[i+1], &toRead) != TCL_OK) {
return TCL_ERROR;
}
+ if (toRead<0) {
+ Tcl_WideInt w;
+ if (Tcl_GetWideIntFromObj(interp, objv[i+1], &w) != TCL_OK) {
+ return TCL_ERROR;
+ }
+ if (w >= (Tcl_WideInt)0) {
+ Tcl_AppendResult(interp,
+ "integer value to large to represent as 32bit signed value",
+ NULL);
+ } else {
+ Tcl_AppendResult(interp, "negative size forbidden", NULL);
+ }
+ return TCL_ERROR;
+ }
break;
case FcopyCommand:
cmdPtr = objv[i+1];