summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandreas_kupries <akupries@shaw.ca>2008-04-09 18:36:17 (GMT)
committerandreas_kupries <akupries@shaw.ca>2008-04-09 18:36:17 (GMT)
commite5d9de8d2936e6830fbef2615afe0bda28903a81 (patch)
tree44ddee7d24d6937590101d3e8526dd532f506393
parent7ddc20c67752f9b428d5c213d2a1964790b2516a (diff)
downloadtcl-e5d9de8d2936e6830fbef2615afe0bda28903a81.zip
tcl-e5d9de8d2936e6830fbef2615afe0bda28903a81.tar.gz
tcl-e5d9de8d2936e6830fbef2615afe0bda28903a81.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.
-rw-r--r--ChangeLog9
-rw-r--r--generic/tclIOCmd.c16
-rw-r--r--tests/ioCmd.test8
3 files changed, 31 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9d05541..3cb9be1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-04-09 Andreas Kupries <andreask@activestate.com>
+
+ * 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.
+
2008-04-08 Andreas Kupries <andreask@activestate.com>
* tests/io.test (io-53.8): Fixed ordering of vwait and after
diff --git a/generic/tclIOCmd.c b/generic/tclIOCmd.c
index c1abee1..3c34845 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.51.2.1 2008/04/09 18:36:18 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];
diff --git a/tests/ioCmd.test b/tests/ioCmd.test
index fcdc326..2906871 100644
--- a/tests/ioCmd.test
+++ b/tests/ioCmd.test
@@ -13,7 +13,7 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: ioCmd.test,v 1.36.2.2 2008/04/04 17:19:43 andreas_kupries Exp $
+# RCS: @(#) $Id: ioCmd.test,v 1.36.2.3 2008/04/09 18:36:18 andreas_kupries Exp $
if {[lsearch [namespace children] ::tcltest] == -1} {
package require tcltest 2
@@ -606,6 +606,12 @@ test iocmd-15.11 {Tcl_FcopyObjCmd} {fcopy} {
test iocmd-15.12 {Tcl_FcopyObjCmd} {fcopy} {
list [catch {fcopy $rfile $wfile -command bar -size foo} msg] $msg
} {1 {expected integer but got "foo"}}
+test iocmd-15.13 {Tcl_FcopyObjCmd} {fcopy} {
+ list [catch {fcopy $rfile $wfile -command bar -size 3221176172} msg] $msg
+} {1 {integer value to large to represent as 32bit signed value}}
+test iocmd-15.14 {Tcl_FcopyObjCmd} {fcopy} {
+ list [catch {fcopy $rfile $wfile -command bar -size -2} msg] $msg
+} {1 {negative size forbidden}}
close $rfile
close $wfile