From e02ff850fe6eb77ee73571cc163783c3df3b4788 Mon Sep 17 00:00:00 2001 From: jbreeden Date: Sat, 5 Mar 2016 13:45:56 -0800 Subject: Null check for irep & initialize loc.lineno --- src/backtrace.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/backtrace.c') diff --git a/src/backtrace.c b/src/backtrace.c index 45a8cc2de..3c15fd83d 100644 --- a/src/backtrace.c +++ b/src/backtrace.c @@ -108,6 +108,8 @@ each_backtrace(mrb_state *mrb, mrb_int ciidx, mrb_code *pc0, each_backtrace_func for (i = ciidx; i >= 0; i--) { struct backtrace_location_raw loc; + loc.lineno = -1; + mrb_callinfo *ci; mrb_irep *irep; mrb_code *pc; @@ -128,8 +130,11 @@ each_backtrace(mrb_state *mrb, mrb_int ciidx, mrb_code *pc0, each_backtrace_func else { pc = pc0; } - loc.filename = mrb_debug_get_filename(irep, (uint32_t)(pc - irep->iseq)); - loc.lineno = mrb_debug_get_line(irep, (uint32_t)(pc - irep->iseq)); + + if (irep) { + loc.filename = mrb_debug_get_filename(irep, (uint32_t)(pc - irep->iseq)); + loc.lineno = mrb_debug_get_line(irep, (uint32_t)(pc - irep->iseq)); + } if (loc.lineno == -1) continue; -- cgit v1.2.3