diff --git a/ChangeLog b/ChangeLog index 521f254c7f..6b32bc4eb1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Fri Sep 26 05:21:01 2014 Eric Wong + + * object.c (rb_class_real): do not dereference 0 VALUE + + * test/ruby/test_module.rb (test_inspect_segfault): + Test case and bug report by Thomas Stratmann. + [ruby-core:65214] [Bug #10282] + Fri Sep 26 05:12:10 2014 Eric Wong * man/ruby.1: document stack size env variables diff --git a/object.c b/object.c index 5b0f7dfdd7..3126ed01e6 100644 --- a/object.c +++ b/object.c @@ -206,9 +206,8 @@ rb_obj_not_equal(VALUE obj1, VALUE obj2) VALUE rb_class_real(VALUE cl) { - if (cl == 0) - return 0; - while ((RBASIC(cl)->flags & FL_SINGLETON) || BUILTIN_TYPE(cl) == T_ICLASS) { + while (cl && + ((RBASIC(cl)->flags & FL_SINGLETON) || BUILTIN_TYPE(cl) == T_ICLASS)) { cl = RCLASS_SUPER(cl); } return cl; diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb index ce5ab2ff73..f025c1948e 100644 --- a/test/ruby/test_module.rb +++ b/test/ruby/test_module.rb @@ -1971,6 +1971,30 @@ class TestModule < Test::Unit::TestCase } end + def test_inspect_segfault + bug_10282 = '[ruby-core:65214] [Bug #10282]' + assert_separately [], <<-RUBY + module ShallowInspect + def shallow_inspect + "foo" + end + end + + module InspectIsShallow + include ShallowInspect + alias_method :inspect, :shallow_inspect + end + + class A + end + + A.prepend InspectIsShallow + + expect = "#" + assert_equal expect, A.new.method(:inspect).inspect, "#{bug_10282}" + RUBY + end + private def assert_top_method_is_private(method)