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

psych_emitter.c: check string

Browse Source 
* ext/psych/psych_emitter.c (start_document): ensure string before
  encoding conversion.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53078 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-12-13 09:27:52 +00:00
parent cdaa94eab4
commit cc03134361
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sun Dec 13 18:27:53 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/psych/psych_emitter.c (start_document): ensure string before
encoding conversion.
Sun Dec 13 18:26:31 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> Sun Dec 13 18:26:31 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/tk/tkutil/tkutil.c (tk_hash_kv): check types of array * ext/tk/tkutil/tkutil.c (tk_hash_kv): check types of array

6
ext/psych/psych_emitter.c
View File

@ -189,13 +189,15 @@ static VALUE start_document(VALUE self, VALUE version, VALUE tags, VALUE imp)
} }
name = RARRAY_AREF(tuple, 0); name = RARRAY_AREF(tuple, 0);
value = RARRAY_AREF(tuple, 1); value = RARRAY_AREF(tuple, 1);
StringValue(name);
StringValue(value);
#ifdef HAVE_RUBY_ENCODING_H #ifdef HAVE_RUBY_ENCODING_H
name = rb_str_export_to_enc(name, encoding); name = rb_str_export_to_enc(name, encoding);
value = rb_str_export_to_enc(value, encoding); value = rb_str_export_to_enc(value, encoding);
#endif #endif
tail->handle = (yaml_char_t *)StringValuePtr(name); tail->handle = (yaml_char_t *)RSTRING_PTR(name);
tail->prefix = (yaml_char_t *)StringValuePtr(value); tail->prefix = (yaml_char_t *)RSTRING_PTR(value);
tail++; tail++;
} }

1
test/psych/test_emitter.rb
View File

@ -53,6 +53,7 @@ module Psych
[[], 'foo', false], [[], 'foo', false],
[[], ['foo'], false], [[], ['foo'], false],
[[], [nil,nil], false], [[], [nil,nil], false],
[[1,1], [[nil, "tag:TALOS"]], 0],
].each do |args| ].each do |args|
assert_raises(TypeError) do assert_raises(TypeError) do
@emitter.start_document(*args) @emitter.start_document(*args)