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

* marshal.c (marshal_dump): use normal object as the buffer so

Browse Source 
that no hidden object is exposed to ruby-level.  [ruby-dev:39744]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25881 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-11-21 07:38:51 +00:00
parent 8f05568afb
commit 75090a663b
3 changed files with 16 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 @@
Sat Nov 21 16:38:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* marshal.c (marshal_dump): use normal object as the buffer so
that no hidden object is exposed to ruby-level. [ruby-dev:39744]
Sat Nov 21 15:58:43 2009 NARUSE, Yui <naruse@ruby-lang.org> Sat Nov 21 15:58:43 2009 NARUSE, Yui <naruse@ruby-lang.org>
* io.c (read_all): fix: false negative invalid byte seequence * io.c (read_all): fix: false negative invalid byte seequence

3
marshal.c
View File

@ -925,7 +925,7 @@ marshal_dump(int argc, VALUE *argv)
arg->untrust = FALSE; arg->untrust = FALSE;
arg->compat_tbl = st_init_numtable(); arg->compat_tbl = st_init_numtable();
arg->encodings = 0; arg->encodings = 0;
arg->str = rb_str_tmp_new(0); arg->str = rb_str_buf_new(0);
if (!NIL_P(port)) { if (!NIL_P(port)) {
if (!rb_respond_to(port, s_write)) { if (!rb_respond_to(port, s_write)) {
type_error: type_error:
@ -949,7 +949,6 @@ marshal_dump(int argc, VALUE *argv)
rb_io_write(arg->dest, arg->str); rb_io_write(arg->dest, arg->str);
rb_str_resize(arg->str, 0); rb_str_resize(arg->str, 0);
} }
RBASIC(arg->str)->klass = rb_cString;
clear_dump_arg(arg); clear_dump_arg(arg);
RB_GC_GUARD(wrapper); RB_GC_GUARD(wrapper);

10
test/ruby/test_marshal.rb
View File

@ -300,4 +300,14 @@ class TestMarshal < Test::Unit::TestCase
assert(true, '[ruby-dev:39425]') assert(true, '[ruby-dev:39425]')
assert_raise(StopIteration) {e.next} assert_raise(StopIteration) {e.next}
end end
def test_dump_buffer
bug2390 = '[ruby-dev:39744]'
w = ""
def w.write(str)
self << str.to_s
end
Marshal.dump(Object.new, w)
assert_not_empty(w, bug2390)
end
end end