[PATCH 2/2] wip

[Eric Wong <e@80x24.org>]

---
 cont.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/cont.c b/cont.c
index 0311e01f99..5d203bfdaf 100644
--- a/cont.c
+++ b/cont.c
@@ -386,9 +386,6 @@ cont_free(void *ptr)
 	}
 #else /* not WIN32 */
 	if (fib->ss_sp != NULL) {
-	    if (cont->type == ROOT_FIBER_CONTEXT) {
-		rb_bug("Illegal root fiber parameter");
-	    }
 	    munmap((void*)fib->ss_sp, fib->ss_size);
 	}
 	else {
@@ -1800,12 +1797,14 @@ rb_fiber_terminate(rb_fiber_t *fib, int need_interrupt)
     fib->context.uc_stack.ss_sp = NULL;
 #endif
 #ifdef MAX_MACHINE_STACK_CACHE
-    /* Ruby must not switch to other thread until storing terminated_machine_stack */
-    terminated_machine_stack.ptr = fib->ss_sp;
-    terminated_machine_stack.size = fib->ss_size / sizeof(VALUE);
-    fib->ss_sp = NULL;
-    fib->cont.machine.stack = NULL;
-    fib->cont.machine.stack_size = 0;
+    if (fib->ss_sp) {
+        /* Ruby must not switch to other thread until storing terminated_machine_stack */
+        terminated_machine_stack.ptr = fib->ss_sp;
+        terminated_machine_stack.size = fib->ss_size / sizeof(VALUE);
+        fib->ss_sp = NULL;
+        fib->cont.machine.stack = NULL;
+        fib->cont.machine.stack_size = 0;
+    }
 #endif
 
     ret_fib = return_fiber();
-- 
EW