diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2014-05-02 08:59:56 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2014-05-02 08:59:56 (GMT) |
| commit | 1e3394cc4fee92acebb7c79a7fb31aba9e1aab54 (patch) | |
| tree | 84ad5e5324401e5fb231e9656e4bcecbb3387ae7 /unix/tclUnixFile.c | |
| parent | 340a361ed19847861c47b986eb8d522c1a6cc700 (diff) | |
| parent | 7ea92b545f09208376e9a9f8aa1aac53148f3f65 (diff) | |
| download | tcl-novem_bug_3598300.zip tcl-novem_bug_3598300.tar.gz tcl-novem_bug_3598300.tar.bz2 | |
merge novemnovem_bug_3598300
Diffstat (limited to 'unix/tclUnixFile.c')
| -rw-r--r-- | unix/tclUnixFile.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/unix/tclUnixFile.c b/unix/tclUnixFile.c index 5bfe5d9..2cb0027 100644 --- a/unix/tclUnixFile.c +++ b/unix/tclUnixFile.c @@ -1105,6 +1105,12 @@ TclNativeCreateNativeRep( str = Tcl_GetStringFromObj(validPathPtr, &len); Tcl_UtfToExternalDString(NULL, str, len, &ds); len = Tcl_DStringLength(&ds) + sizeof(char); + if (strlen(Tcl_DStringValue(&ds)) < len - sizeof(char)) { + /* See bug [3118489]: NUL in filenames */ + Tcl_DecrRefCount(validPathPtr); + Tcl_DStringFree(&ds); + return NULL; + } Tcl_DecrRefCount(validPathPtr); nativePathPtr = ckalloc(len); memcpy(nativePathPtr, Tcl_DStringValue(&ds), (size_t) len); |