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) 63067,63068: [Backport #14658]

Browse source 
Fix Kernel#singleton_method with Module#Prepend

	* proc.c (rb_obj_singleton_method): search the method entry from
	  the origin class, for fix prepended modules.  [Bug #14658]

	From: Vasiliy Ermolovich <younash@gmail.com>

	proc.c: fix segfault when no singleton class

	* proc.c (rb_obj_singleton_method): bail out if the receiver does
	  not have the singleton class without accessing the origin class
	  not to segfault.  [Bug #14658]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@64981 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2018-10-09 14:39:16 +00:00
parent 98eb63a896
commit e2283c62f5
3 changed files with 25 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
proc.c
View file

@ -1769,21 +1769,23 @@ VALUE
rb_obj_singleton_method(VALUE obj, VALUE vid) rb_obj_singleton_method(VALUE obj, VALUE vid)
{ {
const rb_method_entry_t *me; const rb_method_entry_t *me;
VALUE klass; VALUE klass = rb_singleton_class_get(obj);
ID id = rb_check_id(&vid); ID id = rb_check_id(&vid);
if (!id) { if (NIL_P(klass) || NIL_P(klass = RCLASS_ORIGIN(klass))) {
if (!NIL_P(klass = rb_singleton_class_get(obj)) &&
respond_to_missing_p(klass, obj, vid, FALSE)) {
id = rb_intern_str(vid);
return mnew_missing(klass, obj, id, rb_cMethod);
}
undef: undef:
rb_name_err_raise("undefined singleton method `%1$s' for `%2$s'", rb_name_err_raise("undefined singleton method `%1$s' for `%2$s'",
obj, vid); obj, vid);
} }
if (NIL_P(klass = rb_singleton_class_get(obj)) || if (!id) {
UNDEFINED_METHOD_ENTRY_P(me = rb_method_entry_at(klass, id)) || if (respond_to_missing_p(klass, obj, vid, FALSE)) {
id = rb_intern_str(vid);
return mnew_missing(klass, obj, id, rb_cMethod);
}
goto undef;
}
me = rb_method_entry_at(klass, id);
if (UNDEFINED_METHOD_ENTRY_P(me) ||
UNDEFINED_REFINED_METHOD_P(me->def)) { UNDEFINED_REFINED_METHOD_P(me->def)) {
vid = ID2SYM(id); vid = ID2SYM(id);
goto undef; goto undef;

13
test/ruby/test_method.rb
View file

@ -782,6 +782,19 @@ class TestMethod < Test::Unit::TestCase
assert_equal(:bar, m.call, feature8391) assert_equal(:bar, m.call, feature8391)
end end
def test_singleton_method_prepend
bug14658 = '[Bug #14658]'
c1 = Class.new
o = c1.new
def o.bar; :bar; end
class << o; prepend Module.new; end
m = assert_nothing_raised(NameError, bug14658) {o.singleton_method(:bar)}
assert_equal(:bar, m.call, bug14658)
o = Object.new
assert_raise(NameError, bug14658) {o.singleton_method(:bar)}
end
Feature9783 = '[ruby-core:62212] [Feature #9783]' Feature9783 = '[ruby-core:62212] [Feature #9783]'
def assert_curry_three_args(m) def assert_curry_three_args(m)

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.5.2" #define RUBY_VERSION "2.5.2"
#define RUBY_RELEASE_DATE "2018-10-09" #define RUBY_RELEASE_DATE "2018-10-09"
#define RUBY_PATCHLEVEL 94 #define RUBY_PATCHLEVEL 95
#define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_YEAR 2018
#define RUBY_RELEASE_MONTH 10 #define RUBY_RELEASE_MONTH 10