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

psych_emitter.c: check tags range

Browse source 
* ext/psych/psych_emitter.c (start_document): should not exceed
  tags array range.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53079 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-12-13 09:28:51 +00:00
parent cc03134361
commit db48c30794
3 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,4 +1,7 @@
Sun Dec 13 18:27:53 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
Sun Dec 13 18:28:52 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/psych/psych_emitter.c (start_document): should not exceed
tags array range.
* ext/psych/psych_emitter.c (start_document): ensure string before
encoding conversion.

6
ext/psych/psych_emitter.c
View file

@ -167,16 +167,18 @@ static VALUE start_document(VALUE self, VALUE version, VALUE tags, VALUE imp)
if(RTEST(tags)) {
long i = 0;
long len;
#ifdef HAVE_RUBY_ENCODING_H
rb_encoding * encoding = rb_utf8_encoding();
#endif
Check_Type(tags, T_ARRAY);
head = xcalloc((size_t)RARRAY_LEN(tags), sizeof(yaml_tag_directive_t));
len = RARRAY_LEN(tags);
head = xcalloc((size_t)len, sizeof(yaml_tag_directive_t));
tail = head;
for(i = 0; i < RARRAY_LEN(tags); i++) {
for(i = 0; i < len && i < RARRAY_LEN(tags); i++) {
VALUE tuple = RARRAY_AREF(tags, i);
VALUE name;
VALUE value;

15
test/psych/test_emitter.rb
View file

@ -90,5 +90,20 @@ module Psych
@emitter.start_sequence(nil, nil, true, :foo)
end
end
def test_resizing_tags
tags = []
version = [1,1]
obj = Object.new
obj.instance_variable_set(:@tags, tags)
def obj.to_str
(1..10).map{|x| @tags.push(["AAAA","BBBB"])}
return "x"
end
tags.push([obj, "tag:TALOS"])
@emitter.start_document(version, tags, 0)
assert(true)
end
end
end