diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2014-11-03 12:44:55 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2014-11-03 12:44:55 (GMT) |
| commit | bce5edef8b197d622f6f22b25021afd987743698 (patch) | |
| tree | 7faccb16d2a2785049ba78869754cffc11a0ef41 | |
| parent | 746cb2938e7c4bf900a55899aa1445ece67d52ea (diff) | |
| download | tcl-bce5edef8b197d622f6f22b25021afd987743698.zip tcl-bce5edef8b197d622f6f22b25021afd987743698.tar.gz tcl-bce5edef8b197d622f6f22b25021afd987743698.tar.bz2 | |
Add test-case for previous commit, which shows that when trying to open a filename with invalid characters gives the right error-message. (same bug existed on UNIX too, which is now fixed)
| -rw-r--r-- | tests/fileSystem.test | 3 | ||||
| -rw-r--r-- | unix/tclUnixChan.c | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/tests/fileSystem.test b/tests/fileSystem.test index 161ebc3..c255b1e 100644 --- a/tests/fileSystem.test +++ b/tests/fileSystem.test @@ -708,6 +708,9 @@ test filesystem-6.32 {empty file name} { test filesystem-6.33 {empty file name} { list [catch {file writable ""} msg] $msg } {0 0} +test filesystem-6.34 {file name with (invalid) nul character} { + list [catch "open foo\x00" msg] $msg +} [list 1 "couldn't open \"foo\x00\": filename is invalid on this platform"] # Make sure the testfilesystem hasn't been registered. if {[testConstraint testfilesystem]} { diff --git a/unix/tclUnixChan.c b/unix/tclUnixChan.c index 1d60340..89c9a27 100644 --- a/unix/tclUnixChan.c +++ b/unix/tclUnixChan.c @@ -1647,6 +1647,11 @@ TclpOpenFileChannel( native = Tcl_FSGetNativePath(pathPtr); if (native == NULL) { + if (interp != (Tcl_Interp *) NULL) { + Tcl_AppendResult(interp, "couldn't open \"", + TclGetString(pathPtr), "\": filename is invalid on this platform", + NULL); + } return NULL; } |