diff options
| author | dgp@users.sourceforge.net <dgp> | 2015-07-17 21:22:22 (GMT) |
|---|---|---|
| committer | dgp@users.sourceforge.net <dgp> | 2015-07-17 21:22:22 (GMT) |
| commit | dee9a9cbe77ea21d498f9c6c3885df0a93c8da50 (patch) | |
| tree | eb303b04e47fe05468dc5620171a0ee2c8453095 /unix/tclUnixFile.c | |
| parent | 3b5dff82b3bea4153a4034c95ebdc7af76076428 (diff) | |
| parent | 77985b9936c999f8cbcb0f87825fedb45afada9a (diff) | |
| download | tcl-dee9a9cbe77ea21d498f9c6c3885df0a93c8da50.zip tcl-dee9a9cbe77ea21d498f9c6c3885df0a93c8da50.tar.gz tcl-dee9a9cbe77ea21d498f9c6c3885df0a93c8da50.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); |