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

object.c (rb_class_real): do not dereference 0 VALUE

Browse source 
* test/ruby/test_module.rb (test_inspect_segfault):
  Test case and bug report by Thomas Stratmann.
  [ruby-core:65214] [Bug #10282]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47715 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
normal 2014-09-25 20:29:15 +00:00
parent e0f02160bc
commit 0ef94bd2af
3 changed files with 34 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Fri Sep 26 05:21:01 2014 Eric Wong <e@80x24.org>
* 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 <e@80x24.org>
* man/ruby.1: document stack size env variables

5
object.c
View file

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

24
test/ruby/test_module.rb
View file

@ -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 = "#<Method: A(Object)#inspect(shallow_inspect)>"
assert_equal expect, A.new.method(:inspect).inspect, "#{bug_10282}"
RUBY
end
private
def assert_top_method_is_private(method)