diff options
| author | Kevin B Kenny <kennykb@acm.org> | 2014-06-29 02:20:31 (GMT) |
|---|---|---|
| committer | Kevin B Kenny <kennykb@acm.org> | 2014-06-29 02:20:31 (GMT) |
| commit | 54aa5c1f2d5513d45d1361a3615125a4810cc1c0 (patch) | |
| tree | 9e84f6c42d0fdc3d3a0958996705d2c2fbb5f722 /unix/tclUnixFile.c | |
| parent | 2ac3c16d405d20153ce0ad43f308ff05bc372f7a (diff) | |
| parent | c0edc29d67c0944180ce922c7f63d6dd3c3bdf6c (diff) | |
| download | tcl-54aa5c1f2d5513d45d1361a3615125a4810cc1c0.zip tcl-54aa5c1f2d5513d45d1361a3615125a4810cc1c0.tar.gz tcl-54aa5c1f2d5513d45d1361a3615125a4810cc1c0.tar.bz2 | |
merge trunk
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); |