diff options
| author | dgp@users.sourceforge.net <dgp> | 2014-05-16 14:47:59 (GMT) |
|---|---|---|
| committer | dgp@users.sourceforge.net <dgp> | 2014-05-16 14:47:59 (GMT) |
| commit | 823e61ed36793330f0165f4eafc108378d771a4d (patch) | |
| tree | f40ad72828d9fa3a5dc4a59ede2dee8daed72706 /unix/tclUnixFile.c | |
| parent | 0eab721a6b09d8a75c80e6319eaa25e12914d094 (diff) | |
| parent | fd27d760188bb7cdb8b3a0d0b6288328d693db9e (diff) | |
| download | tcl-823e61ed36793330f0165f4eafc108378d771a4d.zip tcl-823e61ed36793330f0165f4eafc108378d771a4d.tar.gz tcl-823e61ed36793330f0165f4eafc108378d771a4d.tar.bz2 | |
merge 8.5
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 29f1aba..c5f75a7 100644 --- a/unix/tclUnixFile.c +++ b/unix/tclUnixFile.c @@ -1111,6 +1111,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((unsigned) len); memcpy((void*)nativePathPtr, (void*)Tcl_DStringValue(&ds), (size_t) len); |