summaryrefslogtreecommitdiffstats
path: root/generic/tclPipe.c
diff options
context:
space:
mode:
authorrmax <rmax>2006-01-16 19:31:18 (GMT)
committerrmax <rmax>2006-01-16 19:31:18 (GMT)
commitf388a5c71529a9aa4ed00cadbd0551e19c8c32bb (patch)
treebb4d4c02dd4d0a6f73c6f77b2b41e9d00722e46e /generic/tclPipe.c
parent8fdd6a29a9c9eb192eadf1c481e74db3162cc3d3 (diff)
downloadtcl-f388a5c71529a9aa4ed00cadbd0551e19c8c32bb.zip
tcl-f388a5c71529a9aa4ed00cadbd0551e19c8c32bb.tar.gz
tcl-f388a5c71529a9aa4ed00cadbd0551e19c8c32bb.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/tclPipe.c')
-rw-r--r--generic/tclPipe.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/generic/tclPipe.c b/generic/tclPipe.c
index 9750131..accfd62 100644
--- a/generic/tclPipe.c
+++ b/generic/tclPipe.c
@@ -10,7 +10,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.7.2.3 2005/10/05 22:09:11 andreas_kupries Exp $
+ * RCS: @(#) $Id: tclPipe.c,v 1.7.2.4 2006/01/16 19:31:18 rmax Exp $
*/
#include "tclInt.h"
@@ -135,11 +135,10 @@ FileForRedirect(interp, spec, atOK, arg, nextArg, flags, skipPtr, closePtr,
*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 ",