From b50bd11f761169b1502d4fc53a9e9c71835d6c6b Mon Sep 17 00:00:00 2001 From: dgp Date: Tue, 15 May 2007 18:32:14 +0000 Subject: * generic/tclNamesp.c: Plugged memory leak related to [namespace delete ::]. [Bug 1716782] FossilOrigin-Name: 13bfe388224dbb90372889d1e58bede56081bf65 --- ChangeLog | 3 +++ generic/tclNamesp.c | 10 ++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8379c96..d6df74f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2007-05-15 Don Porter + * generic/tclNamesp.c: Plugged memory leak related to + [namespace delete ::]. [Bug 1716782] + * changes: updates for 8.4.15 release. * win/tclWinReg.c: Bump to registry 1.1.5 to account diff --git a/generic/tclNamesp.c b/generic/tclNamesp.c index 4f72e4c..8f42df6 100644 --- a/generic/tclNamesp.c +++ b/generic/tclNamesp.c @@ -19,7 +19,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclNamesp.c,v 1.31.2.13 2006/11/28 22:20:02 andreas_kupries Exp $ + * RCS: @(#) $Id: tclNamesp.c,v 1.31.2.14 2007/05/15 18:32:18 dgp Exp $ */ #include "tclInt.h" @@ -648,7 +648,13 @@ Tcl_DeleteNamespace(namespacePtr) } else { nsPtr->flags |= NS_DEAD; } - } + } else { + /* + * We didn't really kill it, so remove the KILLED marks, so + * it can get killed later, avoiding mem leaks + */ + nsPtr->flags &= ~(NS_DYING|NS_KILLED); + } } } -- cgit v0.12