summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2009-08-18 14:44:21 (GMT)
committerdgp <dgp@users.sourceforge.net>2009-08-18 14:44:21 (GMT)
commit2a9cfcc7744dc99bb7f19869ccec28b275cca147 (patch)
tree41726dda308fc5cf1bf7bac6b8347f4a46986f52 /generic
parent7224aab4417a253cc7246233a59a1a0e368ce191 (diff)
downloadtcl-2a9cfcc7744dc99bb7f19869ccec28b275cca147.zip
tcl-2a9cfcc7744dc99bb7f19869ccec28b275cca147.tar.gz
tcl-2a9cfcc7744dc99bb7f19869ccec28b275cca147.tar.bz2
* generic/tclPathObj.c: Added NULL check to prevent crashes during
* tests/fileName.test: [glob]. [Bug 2837800]
Diffstat (limited to 'generic')
-rw-r--r--generic/tclPathObj.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c
index 3c7cce5..6c368e5 100644
--- a/generic/tclPathObj.c
+++ b/generic/tclPathObj.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: tclPathObj.c,v 1.80 2009/03/27 19:17:54 dgp Exp $
+ * RCS: @(#) $Id: tclPathObj.c,v 1.81 2009/08/18 14:44:21 dgp Exp $
*/
#include "tclInt.h"
@@ -1684,6 +1684,9 @@ Tcl_FSGetTranslatedPath(
Tcl_Obj *translatedCwdPtr = Tcl_FSGetTranslatedPath(interp,
srcFsPathPtr->cwdPtr);
+ if (translatedCwdPtr == NULL) {
+ return NULL;
+ }
retObj = Tcl_FSJoinToPath(translatedCwdPtr, 1,
&srcFsPathPtr->normPathPtr);