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) 62115: [Backport #14421]

Browse source 
proc: fix super_method segfault after bind

	* proc.c: handle undefined iclass
	  [ruby-core:85231] [Bug #14421]

	From: Eric Wong <e@80x24.org>

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@62866 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2018-03-20 16:21:06 +00:00
parent 9e7b578418
commit f634fc1f8a
3 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
proc.c
View file

@ -2712,6 +2712,7 @@ method_super_method(VALUE method)
TypedData_Get_Struct(method, struct METHOD, &method_data_type, data);
iclass = data->iclass;
if (!iclass) return Qnil;
super_class = RCLASS_SUPER(RCLASS_ORIGIN(iclass));
mid = data->me->called_id;
if (!super_class) return Qnil;

5
test/ruby/test_method.rb
View file

@ -923,6 +923,11 @@ class TestMethod < Test::Unit::TestCase
assert_equal(m1.source_location, m2.source_location, bug)
end
def test_super_method_after_bind
assert_nil String.instance_method(:length).bind(String.new).super_method,
'[ruby-core:85231] [Bug #14421]'
end
def rest_parameter(*rest)
rest
end

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.4.4"
#define RUBY_RELEASE_DATE "2018-03-21"
#define RUBY_PATCHLEVEL 274
#define RUBY_PATCHLEVEL 275
#define RUBY_RELEASE_YEAR 2018
#define RUBY_RELEASE_MONTH 3