diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2015-07-02 12:10:35 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2015-07-02 12:10:35 (GMT) |
| commit | 55717aeaea14002df0d47c139afcad6c27d8ca7a (patch) | |
| tree | aadc95fc6a6dc35494a0f3bfa7428edf75c8701f /unix/tclUnixFile.c | |
| parent | 8615597984a22e3bb59d7b48a14f9ab1ddb97b19 (diff) | |
| parent | 4cd9155ae918a63f1c940a9557bf9ab4afd4a333 (diff) | |
| download | tcl-55717aeaea14002df0d47c139afcad6c27d8ca7a.zip tcl-55717aeaea14002df0d47c139afcad6c27d8ca7a.tar.gz tcl-55717aeaea14002df0d47c139afcad6c27d8ca7a.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); |