diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-11 19:18:45 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-11 19:18:45 +0000 |
| commit | aeddf6677a91a267a8fd73ad00b36ad442623fa7 (patch) | |
| tree | 1a9c921ed42eec22fb7ae08285183ed3187cd8f1 /ext | |
| parent | 7be50feeebf76f72e9000510fa62d4afbdf3a1a4 (diff) | |
merge revision(s) 57510,57511: [Backport #13176]
eval.c: hide internal objects
* eval.c (rb_ensure): veil internal exception objects not to leak
in ensure functions. [ruby-core:79371] [Bug #13176]
ensured.c: fix conflict
* ext/-test-/exception/ensured.c (exc_raise): get rid of conflict
with raise(2) in the standard. [ruby-core:79371] [Bug #13176]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@57885 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/-test-/exception/ensured.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/ext/-test-/exception/ensured.c b/ext/-test-/exception/ensured.c index 365e1f4f79..7dcc9b78ef 100644 --- a/ext/-test-/exception/ensured.c +++ b/ext/-test-/exception/ensured.c @@ -18,8 +18,22 @@ ensured(VALUE module, VALUE object) return rb_ensure(begin, object, ensure, object); } +static VALUE +exc_raise(VALUE exc) +{ + rb_exc_raise(exc); + return Qnil; +} + +static VALUE +ensure_raise(VALUE module, VALUE object, VALUE exc) +{ + return rb_ensure(rb_yield, object, exc_raise, exc); +} + void Init_ensured(VALUE klass) { rb_define_module_function(klass, "ensured", ensured, 1); + rb_define_module_function(klass, "ensure_raise", ensure_raise, 2); } |