diff options
| author | oehhar <harald.oehlmann@elmicron.de> | 2014-05-29 14:53:45 (GMT) |
|---|---|---|
| committer | oehhar <harald.oehlmann@elmicron.de> | 2014-05-29 14:53:45 (GMT) |
| commit | 99881838a7e2f2f15331858f6654beb534bfccc8 (patch) | |
| tree | 9be3430887ad5943e0fe6308e10daaf21569c76a /unix/tclUnixFile.c | |
| parent | b5277efde02115a99b120d3a90fb1471c6aee409 (diff) | |
| parent | d344208a62df4671dac9a66fa4589979bc68d7bb (diff) | |
| download | tcl-99881838a7e2f2f15331858f6654beb534bfccc8.zip tcl-99881838a7e2f2f15331858f6654beb534bfccc8.tar.gz tcl-99881838a7e2f2f15331858f6654beb534bfccc8.tar.bz2 | |
merge core-8-5-branch
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); |