summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorrmax <rmax>2006-01-16 19:38:15 (GMT)
committerrmax <rmax>2006-01-16 19:38:15 (GMT)
commit73cefe9821b18e74d301da6d70d9d2709cacfe7f (patch)
tree486cebf175fe6337e67e436ad7775e69b84d5e20 /generic
parent511d1d6b19ab88a56c6988740f83cbad45f6bc28 (diff)
downloadtcl-73cefe9821b18e74d301da6d70d9d2709cacfe7f.zip
tcl-73cefe9821b18e74d301da6d70d9d2709cacfe7f.tar.gz
tcl-73cefe9821b18e74d301da6d70d9d2709cacfe7f.tar.bz2
* generic/tclPipe.c (FileForRedirect): Prevent nameString from
being freed without having been initialized. * tests/exec.test: Added a test for the above.
Diffstat (limited to 'generic')
-rw-r--r--generic/tclPipe.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/generic/tclPipe.c b/generic/tclPipe.c
index 3cec10c..b02d91b 100644
--- a/generic/tclPipe.c
+++ b/generic/tclPipe.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclPipe.c,v 1.16 2005/11/07 08:56:27 dkf Exp $
+ * RCS: @(#) $Id: tclPipe.c,v 1.17 2006/01/16 19:38:15 rmax Exp $
*/
#include "tclInt.h"
@@ -128,11 +128,10 @@ FileForRedirect(
*skipPtr = 2;
}
name = Tcl_TranslateFileName(interp, spec, &nameString);
- if (name != NULL) {
- file = TclpOpenFile(name, flags);
- } else {
- file = NULL;
+ if (name == NULL) {
+ return NULL;
}
+ file = TclpOpenFile(name, flags);
Tcl_DStringFree(&nameString);
if (file == NULL) {
Tcl_AppendResult(interp, "couldn't ",