diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-27 01:03:22 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-27 01:03:22 +0000 |
commit | db8e3024e74dafa1f76d8d43a1bddfc1270ad073 (patch) | |
tree | bbb75623bb93ad6d88da7ad72fbe50d66ff19d89 | |
parent | 52061f4ecd3b6effb6b35f1aec30061fbc9f7fdb (diff) |
* io.c (read_all): the 3rd argument maybe Qnil.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19956 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | io.c | 3 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Mon Oct 27 10:02:47 2008 NAKAMURA Usaku <usa@ruby-lang.org> + + * io.c (read_all): the 3rd argument maybe Qnil. + Mon Oct 27 01:29:55 2008 Yusuke Endoh <mame@tsg.ne.jp> * test/nkf/test_nkf.rb: add a test for [ruby-dev:36909]. @@ -1556,7 +1556,8 @@ read_all(rb_io_t *fptr, long siz, VALUE str) int cr; if (NEED_READCONV(fptr)) { - if (!NIL_P(str)) rb_str_set_len(str, 0); + if (NIL_P(str)) str = rb_str_new(NULL, 0); + else rb_str_set_len(str, 0); make_readconv(fptr); while (1) { if (fptr->cbuf_len) { |