From c1f84789ba402e590faed95132cf3f621c9bd0bf Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Wed, 20 Dec 2017 18:26:40 +0000
Subject: Fix for issue [ba1419303b4c]: Delete a namespace for an ensemble
 having a deletion trace deletes its namespace: segmentation fault.

---
 generic/tclNamesp.c  | 17 +++++++----------
 tests/namespace.test | 13 +++++++++++++
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/generic/tclNamesp.c b/generic/tclNamesp.c
index a8d351f..542d648 100644
--- a/generic/tclNamesp.c
+++ b/generic/tclNamesp.c
@@ -916,6 +916,11 @@ Tcl_DeleteNamespace(
     Command *cmdPtr;
 
     /*
+     * Ensure that this namespace doesn't get deallocated in the meantime.
+     */
+    nsPtr->refCount++;
+
+    /*
      * Give anyone interested - notably TclOO - a chance to use this namespace
      * normally despite the fact that the namespace is going to go. Allows the
      * calling of destructors. Will only be called once (unless re-established
@@ -1047,16 +1052,8 @@ Tcl_DeleteNamespace(
 #endif
 	    Tcl_DeleteHashTable(&nsPtr->cmdTable);
 
-	    /*
-	     * If the reference count is 0, then discard the namespace.
-	     * Otherwise, mark it as "dead" so that it can't be used.
-	     */
-
-	    if (nsPtr->refCount == 0) {
-		NamespaceFree(nsPtr);
-	    } else {
-		nsPtr->flags |= NS_DEAD;
-	    }
+	    nsPtr ->flags |= NS_DEAD;
+	    TclNsDecrRefCount(nsPtr);
 	} else {
 	    /*
 	     * Restore the ::errorInfo and ::errorCode traces.
diff --git a/tests/namespace.test b/tests/namespace.test
index ff8cd7d..f2d7061 100644
--- a/tests/namespace.test
+++ b/tests/namespace.test
@@ -196,6 +196,19 @@ test namespace-7.7 {Bug 1655305} -setup {
     interp delete slave
 } -result {}
 
+test namespace-7.8 {Bug ba1419303b4c} -setup {
+    namespace eval ns1 {
+	namespace ensemble create
+    }
+
+    trace add command ns1 delete {
+	namespace delete ns1
+    }
+} -body {
+    # No segmentation fault given --enable-symbols=mem. 
+    namespace delete ns1
+} -result {}
+
 test namespace-8.1 {TclTeardownNamespace, delete global namespace} {
     catch {interp delete test_interp}
     interp create test_interp
-- 
cgit v0.12


From 28361a2bfe9fdba5dd0effa2c67390b21649e719 Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Wed, 20 Dec 2017 18:28:10 +0000
Subject: Further fix for issue [ba1419303b4c]: Delete a namespace for an
 ensemble having a deletion trace deletes its namespace: segmentation fault.

---
 generic/tclNamesp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generic/tclNamesp.c b/generic/tclNamesp.c
index 542d648..ba8e8ce 100644
--- a/generic/tclNamesp.c
+++ b/generic/tclNamesp.c
@@ -1053,7 +1053,6 @@ Tcl_DeleteNamespace(
 	    Tcl_DeleteHashTable(&nsPtr->cmdTable);
 
 	    nsPtr ->flags |= NS_DEAD;
-	    TclNsDecrRefCount(nsPtr);
 	} else {
 	    /*
 	     * Restore the ::errorInfo and ::errorCode traces.
@@ -1070,6 +1069,7 @@ Tcl_DeleteNamespace(
 	    nsPtr->flags &= ~(NS_DYING|NS_KILLED);
 	}
     }
+    TclNsDecrRefCount(nsPtr);
 }
 
 /*
-- 
cgit v0.12