diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2015-02-07 00:48:08 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2015-02-07 00:48:08 +0900 |
| commit | f5026f9b6c9957cab0e9ead058b1884ff26b9df6 (patch) | |
| tree | 53f7719d6a3f8b2f07d12147e252757a35f374d5 /src | |
| parent | 1346456c6cb14af9b9a54bbd2da89c11588dbb81 (diff) | |
| parent | df382dea73f30c71ee09099277444facd20ee152 (diff) | |
| download | mruby-f5026f9b6c9957cab0e9ead058b1884ff26b9df6.tar.gz mruby-f5026f9b6c9957cab0e9ead058b1884ff26b9df6.zip | |
Merge pull request #2717 from sgnr/missing-lastpc-on-funcall-cfunc
Fix possible segfault when accessing backtrace with MRB_WORD_BOXING.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backtrace.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/backtrace.c b/src/backtrace.c index a82d8f343..9427c3c8d 100644 --- a/src/backtrace.c +++ b/src/backtrace.c @@ -132,9 +132,18 @@ output_backtrace(mrb_state *mrb, mrb_int ciidx, mrb_code *pc0, output_stream_fun static void exc_output_backtrace(mrb_state *mrb, struct RObject *exc, output_stream_func func, void *stream) { + mrb_value lastpc; + mrb_code *code; + + lastpc = mrb_obj_iv_get(mrb, exc, mrb_intern_lit(mrb, "lastpc")); + if (mrb_nil_p(lastpc)) { + code = NULL; + } else { + code = (mrb_code*)mrb_cptr(lastpc); + } + output_backtrace(mrb, mrb_fixnum(mrb_obj_iv_get(mrb, exc, mrb_intern_lit(mrb, "ciidx"))), - (mrb_code*)mrb_cptr(mrb_obj_iv_get(mrb, exc, mrb_intern_lit(mrb, "lastpc"))), - func, stream); + code, func, stream); } /* mrb_print_backtrace/mrb_get_backtrace: |