diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | generic/tclPathObj.c | 10 |
2 files changed, 13 insertions, 3 deletions
@@ -1,3 +1,9 @@ +2006-01-12 Zoran Vasiljevic <vasiljevic@users.sourceforge.net> + + * generic/tclPathObj.c (Tcl_FSGetInternalRep): backported + patch from core-8-4-branch. A freed pointer has been + overwritten causing all sorts of coredumps. + 2006-01-12 Vince Darley <vincentdarley@sourceforge.net> * win/tclWinFile.c: fix to sharing violation [Bug 1366227] diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c index dd354c7..9ed241a 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.48 2005/11/27 02:33:49 das Exp $ + * RCS: @(#) $Id: tclPathObj.c,v 1.49 2006/01/12 18:35:28 vasiljevic Exp $ */ #include "tclInt.h" @@ -2015,12 +2015,16 @@ Tcl_FSGetInternalRep( if (srcFsPathPtr->nativePathPtr == NULL) { Tcl_FSCreateInternalRepProc *proc; - proc = srcFsPathPtr->fsRecPtr->fsPtr->createInternalRepProc; + char *nativePathPtr; + proc = srcFsPathPtr->fsRecPtr->fsPtr->createInternalRepProc; if (proc == NULL) { return NULL; } - srcFsPathPtr->nativePathPtr = (*proc)(pathPtr); + + nativePathPtr = (*proc)(pathPtr); + srcFsPathPtr = (FsPath*) PATHOBJ(pathPtr); + srcFsPathPtr->nativePathPtr = nativePathPtr; } return srcFsPathPtr->nativePathPtr; |