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

Revert r61936 "compile.c: use ALLOCV_N"

Browse source 
* compile.c (ibf_dump_object_list): `dump->obj_list` is not fixed
  yet, as new objects are pushed by lbf_dump_object_object.
  fixes crash by buffer overflow.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62615 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-02-28 23:31:42 +00:00
parent 9af2ab9d89
commit 43e41029bf
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
compile.c
View file

@ -9334,23 +9334,21 @@ ibf_load_object(const struct ibf_load *load, VALUE object_index)
static void
ibf_dump_object_list(struct ibf_dump *dump, struct ibf_header *header)
{
VALUE listv;
ibf_offset_t *list = ALLOCV_N(ibf_offset_t, listv, RARRAY_LEN(dump->obj_list));
VALUE list = rb_ary_tmp_new(RARRAY_LEN(dump->obj_list));
int i, size;
for (i=0; i<RARRAY_LEN(dump->obj_list); i++) {
VALUE obj = RARRAY_AREF(dump->obj_list, i);
ibf_offset_t offset = lbf_dump_object_object(dump, obj);
list[i] = offset;
rb_ary_push(list, UINT2NUM(offset));
}
size = i;
header->object_list_offset = ibf_dump_pos(dump);
for (i=0; i<size; i++) {
ibf_offset_t offset = list[i];
ibf_offset_t offset = NUM2UINT(RARRAY_AREF(list, i));
IBF_WV(offset);
}
ALLOCV_END(listv);
header->object_list_size = size;
}

9
test/ruby/test_iseq.rb
View file

@ -395,4 +395,13 @@ class TestISeq < Test::Unit::TestCase
end
}
end
def test_to_binary_with_objects
code = "[]"+100.times.map{|i|"<</#{i}/"}.join
bin = assert_nothing_raised {
RubyVM::InstructionSequence.compile(code).to_binary
}
# load_from_binary doesn't work now
assert_instance_of(String, bin)
end
end