diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-12-23 11:11:36 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-12-23 11:11:36 +0000 |
commit | d397c89f88e5098f9e9fb7034249505caf993f67 (patch) | |
tree | 5ebb190b6673d8e8f33899646ef6aaceb25668fa /eval.c | |
parent | 71e458023d9332745b8a5f25b169ffbd2c5a2a89 (diff) |
Prohibit circular causes [Bug #15447]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66510 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval.c')
-rw-r--r-- | eval.c | 15 |
1 files changed, 15 insertions, 0 deletions
@@ -491,6 +491,7 @@ static inline VALUE exc_setup_message(const rb_execution_context_t *ec, VALUE mesg, VALUE *cause) { int nocause = 0; + int nocircular = 0; if (NIL_P(mesg)) { mesg = ec->errinfo; @@ -500,18 +501,32 @@ exc_setup_message(const rb_execution_context_t *ec, VALUE mesg, VALUE *cause) if (NIL_P(mesg)) { mesg = rb_exc_new(rb_eRuntimeError, 0, 0); nocause = 0; + nocircular = 1; } if (*cause == Qundef) { if (nocause) { *cause = Qnil; + nocircular = 1; } else if (!rb_ivar_defined(mesg, id_cause)) { *cause = get_ec_errinfo(ec); } + else { + nocircular = 1; + } } else if (!NIL_P(*cause) && !rb_obj_is_kind_of(*cause, rb_eException)) { rb_raise(rb_eTypeError, "exception object expected"); } + + if (!nocircular && !NIL_P(*cause) && *cause != Qundef && *cause != mesg) { + VALUE c = *cause; + while (!NIL_P(c = rb_attr_get(c, id_cause))) { + if (c == mesg) { + rb_raise(rb_eArgError, "circular causes"); + } + } + } return mesg; } |