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

io.c: no error on frozen IO

Browse source 
* io.c (rb_io_fileno, rb_io_inspect): non-modification does not
  error on frozen IO.  [ruby-dev:48241] [Bug #9865]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46151 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-05-27 02:12:59 +00:00
parent bfd63b28b5
commit 2e5d698538
3 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Tue May 27 11:12:56 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (rb_io_fileno, rb_io_inspect): non-modification does not
error on frozen IO. [ruby-dev:48241] [Bug #9865]
Tue May 27 00:00:21 2014 yui-knk <spiketeika@gmail.com> Tue May 27 00:00:21 2014 yui-knk <spiketeika@gmail.com>
* insns.def (defineclass): fix typo in the instruction comment. * insns.def (defineclass): fix typo in the instruction comment.

6
io.c
View file

@ -1996,10 +1996,10 @@ rb_io_fdatasync(VALUE io)
static VALUE static VALUE
rb_io_fileno(VALUE io) rb_io_fileno(VALUE io)
{ {
rb_io_t *fptr; rb_io_t *fptr = RFILE(io)->fptr;
int fd; int fd;
GetOpenFile(io, fptr); rb_io_check_closed(fptr);
fd = fptr->fd; fd = fptr->fd;
return INT2FIX(fd); return INT2FIX(fd);
} }
@ -2051,7 +2051,7 @@ rb_io_inspect(VALUE obj)
VALUE result; VALUE result;
static const char closed[] = " (closed)"; static const char closed[] = " (closed)";
fptr = RFILE(rb_io_taint_check(obj))->fptr; fptr = RFILE(obj)->fptr;
if (!fptr) return rb_any_to_s(obj); if (!fptr) return rb_any_to_s(obj);
result = rb_str_new_cstr("#<"); result = rb_str_new_cstr("#<");
rb_str_append(result, rb_class_name(CLASS_OF(obj))); rb_str_append(result, rb_class_name(CLASS_OF(obj)));

10
test/ruby/test_io.rb
View file

@ -1122,6 +1122,8 @@ class TestIO < Test::Unit::TestCase
def test_inspect def test_inspect
with_pipe do |r, w| with_pipe do |r, w|
assert_match(/^#<IO:fd \d+>$/, r.inspect) assert_match(/^#<IO:fd \d+>$/, r.inspect)
r.freeze
assert_match(/^#<IO:fd \d+>$/, r.inspect)
end end
end end
@ -2786,6 +2788,14 @@ End
assert_equal(2, $stderr.fileno) assert_equal(2, $stderr.fileno)
end end
def test_frozen_fileno
bug9865 = '[ruby-dev:48241] [Bug #9865]'
with_pipe do |r,w|
fd = r.fileno
assert_equal(fd, r.freeze.fileno, bug9865)
end
end
def test_sysread_locktmp def test_sysread_locktmp
bug6099 = '[ruby-dev:45297]' bug6099 = '[ruby-dev:45297]'
buf = " " * 100 buf = " " * 100