Merge pull request #1268 from usev6/Rakudo#3605

Avoid null pointer in backtrace and avoid segfault
MoarVM · Apr 6, 2020 · 838e683 · 838e683
2 parents c7e75be + a4689f9
commit 838e683
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/core/exceptions.c b/src/core/exceptions.c
@@ -573,7 +573,8 @@ MVMObject * MVM_exception_backtrace(MVMThreadContext *tc, MVMObject *ex_obj) {
 
         /* row will contain "sub" and "annotations" */
         row = MVM_repr_alloc_init(tc, tc->instance->boot_types.BOOTHash);
-        MVM_repr_bind_key_o(tc, row, k_sub, cur_frame->code_ref);
+        MVM_repr_bind_key_o(tc, row, k_sub,
+            cur_frame->code_ref ? cur_frame->code_ref : tc->instance->VMNull);
         MVM_repr_bind_key_o(tc, row, k_anno, annotations);
 
         MVM_repr_push_o(tc, arr, row);