summaryrefslogtreecommitdiffstats
path: root/generic/tclOO.c
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2015-05-18 14:44:16 (GMT)
committerdgp <dgp@users.sourceforge.net>2015-05-18 14:44:16 (GMT)
commitbeff5c1af7bf750d576575804688f897d55ad3b9 (patch)
tree337298bddad20a3e2e1ceeded3791635035d8a51 /generic/tclOO.c
parentedc419b297d95a7a21b718d7f447f9c249500a28 (diff)
parentf2aa46953cedd6fe3b80766c84fb9720ae37f771 (diff)
downloadtcl-bug_3608714.zip
tcl-bug_3608714.tar.gz
tcl-bug_3608714.tar.bz2
merge trunkbug_3608714
Diffstat (limited to 'generic/tclOO.c')
-rw-r--r--generic/tclOO.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/generic/tclOO.c b/generic/tclOO.c
index 77e668b..e2ef1ae 100644
--- a/generic/tclOO.c
+++ b/generic/tclOO.c
@@ -1675,10 +1675,13 @@ Tcl_NewObjectInstance(
/*
* Take care to not delete a deleted object; that would be
- * bad. [Bug 2903011]
+ * bad. [Bug 2903011] Also take care to make sure that we have
+ * the name of the command before we delete it. [Bug
+ * 9dd1bd7a74]
*/
if (!Deleted(oPtr)) {
+ (void) TclOOObjectName(interp, oPtr);
Tcl_DeleteCommandFromToken(interp, oPtr->command);
}
return NULL;
@@ -1821,10 +1824,12 @@ FinalizeAlloc(
/*
* Take care to not delete a deleted object; that would be bad. [Bug
- * 2903011]
+ * 2903011] Also take care to make sure that we have the name of the
+ * command before we delete it. [Bug 9dd1bd7a74]
*/
if (!Deleted(oPtr)) {
+ (void) TclOOObjectName(interp, oPtr);
Tcl_DeleteCommandFromToken(interp, oPtr->command);
}
DelRef(oPtr);