summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-05 23:06:50 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-05 23:06:50 +0000
commitfdcc9c9e43ea8e67479e604a741b8fad09239ec8 (patch)
tree33bef5a8fa7ca8dae0b1db3330f05e4e0a1cddeb
parentc076d6009c4f3e979930b6060e35338172ba34e6 (diff)
Don't set throw data as cause [Bug #15282]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65554 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--eval.c2
-rw-r--r--test/ruby/test_exception.rb6
2 files changed, 7 insertions, 1 deletions
diff --git a/eval.c b/eval.c
index 35255e0..5900f22 100644
--- a/eval.c
+++ b/eval.c
@@ -531,7 +531,7 @@ setup_exception(rb_execution_context_t *ec, int tag, volatile VALUE mesg, VALUE
mesg = rb_obj_dup(mesg);
}
}
- if (cause != Qundef) {
+ if (cause != Qundef && !THROW_DATA_P(cause)) {
exc_setup_cause(mesg, cause);
}
if (NIL_P(bt)) {
diff --git a/test/ruby/test_exception.rb b/test/ruby/test_exception.rb
index 8784dd7..88b0229 100644
--- a/test/ruby/test_exception.rb
+++ b/test/ruby/test_exception.rb
@@ -699,6 +699,12 @@ end.join
assert_same(a, e.cause.cause)
end
+ def test_cause_at_end
+ assert_in_out_err([], <<-'end;', [], [/-: unexpected return\n/, /.*undefined local variable or method `n'.*\n/])
+ END{n}; END{return}
+ end;
+ end
+
def test_raise_with_cause
msg = "[Feature #8257]"
cause = ArgumentError.new("foobar")