diff options
| author | dgp <dgp@users.sourceforge.net> | 2016-09-08 12:28:19 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2016-09-08 12:28:19 (GMT) |
| commit | 90bd7a732609ca0664078461027a02ae6f357d97 (patch) | |
| tree | 4e6118d8e9cea8226d47192cc2c42fe802864562 /unix/tclUnixFile.c | |
| parent | 498f733a1bd10ee1f6e8f97a3f8f4021ac9faa1f (diff) | |
| parent | 71968e0f29b83374e539b31314b21a43b7ab61b6 (diff) | |
| download | tcl-90bd7a732609ca0664078461027a02ae6f357d97.zip tcl-90bd7a732609ca0664078461027a02ae6f357d97.tar.gz tcl-90bd7a732609ca0664078461027a02ae6f357d97.tar.bz2 | |
merge 8.6.2
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); |