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

stringio.c: use rb_str_append

Browse source 
* ext/stringio/stringio.c (strio_write): use rb_str_append to
  reuse coderange bits and keep taintedness.
  [ruby-dev:48118] [Bug #9769]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45670 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-04-22 14:14:30 +00:00
parent c143b9a0ab
commit a197581765
3 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Tue Apr 22 23:14:28 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/stringio/stringio.c (strio_write): use rb_str_append to
reuse coderange bits and keep taintedness.
[ruby-dev:48118] [Bug #9769]
Tue Apr 22 22:15:51 2014 NAKAMURA Usaku <usa@ruby-lang.org> Tue Apr 22 22:15:51 2014 NAKAMURA Usaku <usa@ruby-lang.org>
* file.c (rb_io_statfs): need to define even if the system doesn't have * file.c (rb_io_statfs): need to define even if the system doesn't have

4
ext/stringio/stringio.c
View file

@ -1170,7 +1170,6 @@ strio_write(VALUE self, VALUE str)
long len, olen; long len, olen;
rb_encoding *enc, *enc2; rb_encoding *enc, *enc2;
RB_GC_GUARD(str);
if (!RB_TYPE_P(str, T_STRING)) if (!RB_TYPE_P(str, T_STRING))
str = rb_obj_as_string(str); str = rb_obj_as_string(str);
enc = rb_enc_get(ptr->string); enc = rb_enc_get(ptr->string);
@ -1186,7 +1185,7 @@ strio_write(VALUE self, VALUE str)
ptr->pos = olen; ptr->pos = olen;
} }
if (ptr->pos == olen) { if (ptr->pos == olen) {
rb_enc_str_buf_cat(ptr->string, RSTRING_PTR(str), len, enc); rb_str_append(ptr->string, str);
} }
else { else {
strio_extend(ptr, ptr->pos, len); strio_extend(ptr, ptr->pos, len);
@ -1194,6 +1193,7 @@ strio_write(VALUE self, VALUE str)
OBJ_INFECT(ptr->string, str); OBJ_INFECT(ptr->string, str);
} }
OBJ_INFECT(ptr->string, self); OBJ_INFECT(ptr->string, self);
RB_GC_GUARD(str);
ptr->pos += len; ptr->pos += len;
return LONG2NUM(len); return LONG2NUM(len);
} }

11
test/stringio/test_stringio.rb
View file

@ -119,6 +119,17 @@ class TestStringIO < Test::Unit::TestCase
f.close unless f.closed? f.close unless f.closed?
end end
def test_write_infection
bug9769 = '[ruby-dev:48118] [Bug #9769]'
s = "".untaint
f = StringIO.new(s, "w")
f.print("bar".taint)
f.close
assert_predicate(s, :tainted?, bug9769)
ensure
f.close unless f.closed?
end
def test_mode_error def test_mode_error
f = StringIO.new("", "r") f = StringIO.new("", "r")
assert_raise(IOError) { f.write("foo") } assert_raise(IOError) { f.write("foo") }