From 36b9a37a80d2b740c49b8d7e35572ade2c2b7fa4 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 22 Aug 2016 00:02:59 +0000 Subject: [PATCH] iseq.c: undef allocator * iseq.c (Init_ISeq): undefine allocator of InstructionSequence, to get rid of segfaults at method call on uninitialized object. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55981 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ iseq.c | 1 + test/ruby/test_iseq.rb | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index af89f9bbda..cb2ace44c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Aug 22 09:02:56 2016 Nobuyoshi Nakada + + * iseq.c (Init_ISeq): undefine allocator of InstructionSequence, + to get rid of segfaults at method call on uninitialized object. + Sat Aug 21 05:47:00 2016 Kenta Murata * enum.c (enum_sort): prevent wasteful array duplication. diff --git a/iseq.c b/iseq.c index 93be1ed956..b6b31c052f 100644 --- a/iseq.c +++ b/iseq.c @@ -2419,6 +2419,7 @@ Init_ISeq(void) { /* declare ::RubyVM::InstructionSequence */ rb_cISeq = rb_define_class_under(rb_cRubyVM, "InstructionSequence", rb_cObject); + rb_undef_alloc_func(rb_cISeq); rb_define_method(rb_cISeq, "inspect", iseqw_inspect, 0); rb_define_method(rb_cISeq, "disasm", iseqw_disasm, 0); rb_define_method(rb_cISeq, "disassemble", iseqw_disasm, 0); diff --git a/test/ruby/test_iseq.rb b/test/ruby/test_iseq.rb index cdfa380edd..94aebe1f90 100644 --- a/test/ruby/test_iseq.rb +++ b/test/ruby/test_iseq.rb @@ -19,6 +19,10 @@ class TestISeq < Test::Unit::TestCase body.find_all{|e| e.kind_of? Integer} end + def test_allocate + assert_raise(TypeError) {ISeq.allocate} + end + def test_to_a_lines src = <<-EOS p __LINE__ # 1