1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* iseq.c (iseq_data_to_ary): check line info table boundary. line

Browse Source 
number 0 means no line number info is needed.  [ruby-dev:45130]
  [Bug #5894]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34303 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-01-14 12:56:46 +00:00
parent 3772335ae6
commit e72ae8cc0f
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Sat Jan 14 21:56:43 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* iseq.c (iseq_data_to_ary): check line info table boundary. line
number 0 means no line number info is needed. [ruby-dev:45130]
[Bug #5894]
Sat Jan 14 18:24:13 2012 CHIKANAGA Tomoyuki <nagachika00@gmail.com> Sat Jan 14 18:24:13 2012 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
* error.c (exc_equal): clear rb_thread_t::errinfo when ignore * error.c (exc_equal): clear rb_thread_t::errinfo when ignore

5
iseq.c
View File

@ -1104,7 +1104,8 @@ cdhash_each(VALUE key, VALUE value, VALUE ary)
static VALUE static VALUE
iseq_data_to_ary(rb_iseq_t *iseq) iseq_data_to_ary(rb_iseq_t *iseq)
{ {
long i, ti; long i;
size_t ti;
unsigned int pos; unsigned int pos;
unsigned int line = 0; unsigned int line = 0;
VALUE *seq; VALUE *seq;
@ -1315,7 +1316,7 @@ iseq_data_to_ary(rb_iseq_t *iseq)
rb_ary_push(body, (VALUE)label); rb_ary_push(body, (VALUE)label);
} }
if (iseq->line_info_table[ti].position == pos) { if (iseq->line_info_size < ti && iseq->line_info_table[ti].position == pos) {
line = iseq->line_info_table[ti].line_no; line = iseq->line_info_table[ti].line_no;
rb_ary_push(body, INT2FIX(line)); rb_ary_push(body, INT2FIX(line));
ti++; ti++;

11
test/ruby/test_iseq.rb Normal file
View File

@ -0,0 +1,11 @@
require 'test/unit'
require_relative 'envutil'
class TestISeq < Test::Unit::TestCase
ISeq = RubyVM::InstructionSequence
def test_no_linenum
bug5894 = '[ruby-dev:45130]'
assert_normal_exit('p RubyVM::InstructionSequence.compile("1", "mac", "", 0).to_a', bug5894)
end
end