summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorandreas_kupries <akupries@shaw.ca>2008-04-09 18:35:25 (GMT)
committerandreas_kupries <akupries@shaw.ca>2008-04-09 18:35:25 (GMT)
commit22bed54a233c2bf15f51fd149e2059b59205be71 (patch)
tree65dccc8ef113848eb2542252139a621df32f5b43 /generic
parentb9d8b42283130a00f36eb16526ac8543a95ddc97 (diff)
downloadtcl-22bed54a233c2bf15f51fd149e2059b59205be71.zip
tcl-22bed54a233c2bf15f51fd149e2059b59205be71.tar.gz
tcl-22bed54a233c2bf15f51fd149e2059b59205be71.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 300bef0..48debd8 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.15.2.3 2008/02/26 22:30:26 hobbs Exp $
+ * RCS: @(#) $Id: tclIOCmd.c,v 1.15.2.4 2008/04/09 18:35:27 andreas_kupries Exp $
*/
#include "tclInt.h"
@@ -1542,6 +1542,20 @@ Tcl_FcopyObjCmd(dummy, interp, objc, objv)
if (Tcl_GetIntFromObj(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];