summaryrefslogtreecommitdiffstats
path: root/unix/tclUnixFile.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2014-05-02 07:15:49 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2014-05-02 07:15:49 (GMT)
commite338d72a45468bad9139adc4d43a4167d4e244c6 (patch)
tree870a6a99179fa39483426248efdf8be62fc04f2e /unix/tclUnixFile.c
parentb9c49065a55f1a7ddbda005962a9d0847045c274 (diff)
parentccc37a91935f90ede0be48b9a71b93f54267e608 (diff)
downloadtcl-e338d72a45468bad9139adc4d43a4167d4e244c6.zip
tcl-e338d72a45468bad9139adc4d43a4167d4e244c6.tar.gz
tcl-e338d72a45468bad9139adc4d43a4167d4e244c6.tar.bz2
merge novem
Diffstat (limited to 'unix/tclUnixFile.c')
-rw-r--r--unix/tclUnixFile.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/unix/tclUnixFile.c b/unix/tclUnixFile.c
index a687731..6a26c3e 100644
--- a/unix/tclUnixFile.c
+++ b/unix/tclUnixFile.c
@@ -1108,6 +1108,12 @@ TclNativeCreateNativeRep(
len = validPathPtr->length;
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), len);