diff options
| author | SHIBATA Hiroshi <hsbt@ruby-lang.org> | 2015-12-22 11:14:09 +0900 |
|---|---|---|
| committer | SHIBATA Hiroshi <hsbt@ruby-lang.org> | 2015-12-22 11:14:09 +0900 |
| commit | 37fce6fb5d9fc39f4a46ecf70c7d9a44ab68ed4e (patch) | |
| tree | 5d39932fbf704d2993d4390c4eb479bc01607d7d /ext | |
| parent | 7fb14950a7d7b8ed942e12b2f9ef77194aa0640f (diff) | |
| download | psych-37fce6fb5d9fc39f4a46ecf70c7d9a44ab68ed4e.zip | |
backport revision r53078 and r53079 from ruby/ruby.
https://github.com/ruby/ruby/commit/cc0313436160b735a3d41361cb5e3eeb10fcbdad
https://github.com/ruby/ruby/commit/db48c307944a9a18877236bdf9e9b778875f38ed
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/psych/psych_emitter.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/ext/psych/psych_emitter.c b/ext/psych/psych_emitter.c index 29df96a..371c285 100644 --- a/ext/psych/psych_emitter.c +++ b/ext/psych/psych_emitter.c @@ -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; @@ -189,13 +191,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++; } |