diff options
| author | dgp <dgp@users.sourceforge.net> | 2011-08-12 16:10:12 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2011-08-12 16:10:12 (GMT) |
| commit | 948b2d552982b5117007d46042778e09b38ba9ff (patch) | |
| tree | 57c4dbaffbd553216e83d3d661f0e7a31959fe1a /generic | |
| parent | 751e6372d8ce07e163ea6bd864ae94bebc0167b7 (diff) | |
| parent | 368a70fb725d84b0997d6b9826a3851c87035e8c (diff) | |
| download | tcl-948b2d552982b5117007d46042778e09b38ba9ff.zip tcl-948b2d552982b5117007d46042778e09b38ba9ff.tar.gz tcl-948b2d552982b5117007d46042778e09b38ba9ff.tar.bz2 | |
3389764 Eliminate possibility that "path" value dup can create reference cycle.
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclPathObj.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c index d9e3973..205c301 100644 --- a/generic/tclPathObj.c +++ b/generic/tclPathObj.c @@ -2617,29 +2617,29 @@ DupFsPathInternalRep( SETPATHOBJ(copyPtr, copyFsPathPtr); - if (srcFsPathPtr->translatedPathPtr != NULL) { + if (srcFsPathPtr->translatedPathPtr == srcPtr) { + /* Cycle in src -> make cycle in copy. */ + copyFsPathPtr->translatedPathPtr = copyPtr; + } else { copyFsPathPtr->translatedPathPtr = srcFsPathPtr->translatedPathPtr; - if (copyFsPathPtr->translatedPathPtr != copyPtr) { + if (copyFsPathPtr->translatedPathPtr != NULL) { Tcl_IncrRefCount(copyFsPathPtr->translatedPathPtr); } - } else { - copyFsPathPtr->translatedPathPtr = NULL; } - if (srcFsPathPtr->normPathPtr != NULL) { + if (srcFsPathPtr->normPathPtr == srcPtr) { + /* Cycle in src -> make cycle in copy. */ + copyFsPathPtr->normPathPtr = copyPtr; + } else { copyFsPathPtr->normPathPtr = srcFsPathPtr->normPathPtr; - if (copyFsPathPtr->normPathPtr != copyPtr) { + if (copyFsPathPtr->normPathPtr != NULL) { Tcl_IncrRefCount(copyFsPathPtr->normPathPtr); } - } else { - copyFsPathPtr->normPathPtr = NULL; } - if (srcFsPathPtr->cwdPtr != NULL) { - copyFsPathPtr->cwdPtr = srcFsPathPtr->cwdPtr; + copyFsPathPtr->cwdPtr = srcFsPathPtr->cwdPtr; + if (copyFsPathPtr->cwdPtr != NULL) { Tcl_IncrRefCount(copyFsPathPtr->cwdPtr); - } else { - copyFsPathPtr->cwdPtr = NULL; } copyFsPathPtr->flags = srcFsPathPtr->flags; |