diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-08-18 02:56:32 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-08-18 02:56:32 +0000 |
commit | 6baeed5b4fe22acf1761db879a1e9865cdd2d181 (patch) | |
tree | 738c5cc57b212a393fa95a73add3988186b9ccbf /error.c | |
parent | 7e0cafcd2b904c4bb3e86617d9628ee1296f12c0 (diff) |
merge revision(s) 63417: [Backport #14756]
error.c: check redefined backtrace result
* error.c (rb_get_backtrace): check the result of `backtrace` even
if the method is redefined. [ruby-core:87013] [Bug #14756]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@64430 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'error.c')
-rw-r--r-- | error.c | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -1136,19 +1136,21 @@ VALUE rb_get_backtrace(VALUE exc) { ID mid = id_backtrace; + VALUE info; if (rb_method_basic_definition_p(CLASS_OF(exc), id_backtrace)) { - VALUE info, klass = rb_eException; + VALUE klass = rb_eException; rb_execution_context_t *ec = GET_EC(); if (NIL_P(exc)) return Qnil; EXEC_EVENT_HOOK(ec, RUBY_EVENT_C_CALL, exc, mid, mid, klass, Qundef); info = exc_backtrace(exc); EXEC_EVENT_HOOK(ec, RUBY_EVENT_C_RETURN, exc, mid, mid, klass, info); - if (NIL_P(info)) - return Qnil; - return rb_check_backtrace(info); } - return rb_funcallv(exc, mid, 0, 0); + else { + info = rb_funcallv(exc, mid, 0, 0); + } + if (NIL_P(info)) return Qnil; + return rb_check_backtrace(info); } /* |