diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/psych/psych_emitter.c | 6 | ||||
| -rw-r--r-- | test/psych/test_emitter.rb | 1 |
3 files changed, 10 insertions, 2 deletions
@@ -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> * ext/tk/tkutil/tkutil.c (tk_hash_kv): check types of array diff --git a/ext/psych/psych_emitter.c b/ext/psych/psych_emitter.c index 29df96a562..078ae2b680 100644 --- a/ext/psych/psych_emitter.c +++ b/ext/psych/psych_emitter.c @@ -189,13 +189,15 @@ static VALUE start_document(VALUE self, VALUE version, VALUE tags, VALUE imp) } name = RARRAY_AREF(tuple, 0); value = RARRAY_AREF(tuple, 1); + StringValue(name); + StringValue(value); #ifdef HAVE_RUBY_ENCODING_H name = rb_str_export_to_enc(name, encoding); value = rb_str_export_to_enc(value, encoding); #endif - tail->handle = (yaml_char_t *)StringValuePtr(name); - tail->prefix = (yaml_char_t *)StringValuePtr(value); + tail->handle = (yaml_char_t *)RSTRING_PTR(name); + tail->prefix = (yaml_char_t *)RSTRING_PTR(value); tail++; } diff --git a/test/psych/test_emitter.rb b/test/psych/test_emitter.rb index 1c96c12379..fe198bd1b1 100644 --- a/test/psych/test_emitter.rb +++ b/test/psych/test_emitter.rb @@ -53,6 +53,7 @@ module Psych [[], 'foo', false], [[], ['foo'], false], [[], [nil,nil], false], + [[1,1], [[nil, "tag:TALOS"]], 0], ].each do |args| assert_raises(TypeError) do @emitter.start_document(*args) |