kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 57510,57511: [Backport #13176]

Browse source 
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
This commit is contained in:
naruse 2017-03-11 19:18:45 +00:00
parent 7be50feeeb
commit aeddf6677a
4 changed files with 37 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
eval.c
View file

@ -913,7 +913,7 @@ rb_ensure(VALUE (*b_proc)(ANYARGS), VALUE data1, VALUE (*e_proc)(ANYARGS), VALUE
{
int state;
volatile VALUE result = Qnil;
volatile VALUE errinfo;
VALUE errinfo;
rb_thread_t *const th = GET_THREAD();
rb_ensure_list_t ensure_list;
ensure_list.entry.marker = 0;
@ -927,6 +927,9 @@ rb_ensure(VALUE (*b_proc)(ANYARGS), VALUE data1, VALUE (*e_proc)(ANYARGS), VALUE
}
TH_POP_TAG();
errinfo = th->errinfo;
if (!NIL_P(errinfo) && !RB_TYPE_P(errinfo, T_OBJECT)) {
th->errinfo = Qnil;
}
th->ensure_list=ensure_list.next;
(*ensure_list.entry.e_proc)(ensure_list.entry.data2);
th->errinfo = errinfo;

14
ext/-test-/exception/ensured.c
View file

@ -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);
}

18
test/-ext-/exception/test_exception_at_throwing.rb Normal file
View file

@ -0,0 +1,18 @@
# frozen_string_literal: true
require 'test/unit'
module Bug
class TestException < Test::Unit::TestCase
def test_exception_at_throwing
assert_separately(%w[-r-test-/exception], "#{<<-"begin;"}\n#{<<-"end;"}")
begin;
e = RuntimeError.new("[Bug #13176]")
assert_raise_with_message(e.class, e.message) do
catch do |t|
Bug::Exception.ensure_raise(nil, e) {throw t}
end
end
end;
end
end
end

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.4.0"
#define RUBY_RELEASE_DATE "2017-03-12"
#define RUBY_PATCHLEVEL 49
#define RUBY_PATCHLEVEL 50
#define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 3