account for thread_join deleting tc from threads

MoarVM · Feb 18, 2018 · 6b7532a · 6b7532a
1 parent 8c1f6bc
commit 6b7532a
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/profiler/instrument.c b/src/profiler/instrument.c
@@ -573,7 +573,9 @@ void MVM_profile_dump_instrumented_data(MVMThreadContext *tc) {
 
         while (thread) {
             MVMThreadContext *othertc = thread->body.tc;
-            if (othertc->prof_data) {
+            /* Check for othertc to exist because joining threads nulls out
+             * the tc entry in the thread object. */
+            if (othertc && othertc->prof_data && othertc != tc) {
                 /* If we have any call frames still on the profile stack, exit them. */
                 while (othertc->prof_data->current_call)
                     MVM_profile_log_exit(othertc);