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

null byte at Psych::Emitter.

Browse source 
Check null byte. Patched by tommy (Masahiro Tomita).
  [Bug #13993][ruby-dev:50285]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60588 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
hsbt 2017-10-31 07:24:29 +00:00
parent bd46dad47f
commit 865decb508
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ext/psych/psych_emitter.c
View file

@ -272,8 +272,8 @@ static VALUE scalar(
yaml_scalar_event_initialize( yaml_scalar_event_initialize(
&event, &event,
(yaml_char_t *)(NIL_P(anchor) ? NULL : StringValuePtr(anchor)), (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValueCStr(anchor)),
(yaml_char_t *)(NIL_P(tag) ? NULL : StringValuePtr(tag)), (yaml_char_t *)(NIL_P(tag) ? NULL : StringValueCStr(tag)),
(yaml_char_t*)StringValuePtr(value), (yaml_char_t*)StringValuePtr(value),
(int)RSTRING_LEN(value), (int)RSTRING_LEN(value),
plain ? 1 : 0, plain ? 1 : 0,
@ -319,8 +319,8 @@ static VALUE start_sequence(
yaml_sequence_start_event_initialize( yaml_sequence_start_event_initialize(
&event, &event,
(yaml_char_t *)(NIL_P(anchor) ? NULL : StringValuePtr(anchor)), (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValueCStr(anchor)),
(yaml_char_t *)(NIL_P(tag) ? NULL : StringValuePtr(tag)), (yaml_char_t *)(NIL_P(tag) ? NULL : StringValueCStr(tag)),
implicit ? 1 : 0, implicit ? 1 : 0,
(yaml_sequence_style_t)NUM2INT(style) (yaml_sequence_style_t)NUM2INT(style)
); );
@ -383,8 +383,8 @@ static VALUE start_mapping(
yaml_mapping_start_event_initialize( yaml_mapping_start_event_initialize(
&event, &event,
(yaml_char_t *)(NIL_P(anchor) ? NULL : StringValuePtr(anchor)), (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValueCStr(anchor)),
(yaml_char_t *)(NIL_P(tag) ? NULL : StringValuePtr(tag)), (yaml_char_t *)(NIL_P(tag) ? NULL : StringValueCStr(tag)),
implicit ? 1 : 0, implicit ? 1 : 0,
(yaml_mapping_style_t)NUM2INT(style) (yaml_mapping_style_t)NUM2INT(style)
); );
@ -432,7 +432,7 @@ static VALUE alias(VALUE self, VALUE anchor)
yaml_alias_event_initialize( yaml_alias_event_initialize(
&event, &event,
(yaml_char_t *)(NIL_P(anchor) ? NULL : StringValuePtr(anchor)) (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValueCStr(anchor))
); );
emit(emitter, &event); emit(emitter, &event);

2
ext/psych/psych_yaml_tree.c
View file

@ -9,7 +9,7 @@ VALUE cPsychVisitorsYamlTree;
*/ */
static VALUE private_iv_get(VALUE self, VALUE target, VALUE prop) static VALUE private_iv_get(VALUE self, VALUE target, VALUE prop)
{ {
return rb_attr_get(target, rb_intern(StringValuePtr(prop))); return rb_attr_get(target, rb_intern(StringValueCStr(prop)));
} }
void Init_psych_yaml_tree(void) void Init_psych_yaml_tree(void)