diff options
| -rw-r--r-- | class.c | 6 | ||||
| -rw-r--r-- | test/ruby/test_module.rb | 6 |
2 files changed, 10 insertions, 2 deletions
@@ -1172,12 +1172,14 @@ rb_obj_singleton_methods(int argc, VALUE *argv, VALUE obj) klass = CLASS_OF(obj); list = st_init_numtable(); if (klass && FL_TEST(klass, FL_SINGLETON)) { - st_foreach(RCLASS_M_TBL(klass), method_entry_i, (st_data_t)list); + if (RCLASS_M_TBL(klass)) + st_foreach(RCLASS_M_TBL(klass), method_entry_i, (st_data_t)list); klass = RCLASS_SUPER(klass); } if (RTEST(recur)) { while (klass && (FL_TEST(klass, FL_SINGLETON) || RB_TYPE_P(klass, T_ICLASS))) { - st_foreach(RCLASS_M_TBL(klass), method_entry_i, (st_data_t)list); + if (RCLASS_M_TBL(klass)) + st_foreach(RCLASS_M_TBL(klass), method_entry_i, (st_data_t)list); klass = RCLASS_SUPER(klass); } } diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb index 7f66911e43..aa48e1793c 100644 --- a/test/ruby/test_module.rb +++ b/test/ruby/test_module.rb @@ -1284,4 +1284,10 @@ class TestModule < Test::Unit::TestCase bug6655 = '[ruby-core:45915]' assert_equal(Object.instance_methods, Class.new {prepend Module.new}.instance_methods, bug6655) end + + def test_prepend_singleton_methods + o = Object.new + o.singleton_class.class_eval {prepend Module.new} + assert_equal([], o.singleton_methods) + end end |