summaryrefslogtreecommitdiff
path: root/io.c
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-01-15 15:26:03 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-01-15 15:26:03 +0000
commit255955585c922ec5e303df184057b7781fcee345 (patch)
treeff295100b83381d8d4cf8689bf104b2f48d2092b /io.c
parent0fce0b7ba1337b25d717fc39481eef556d247005 (diff)
* io.c (rb_io_close_m): Don't raise when the IO object is closed.
[ruby-core:67444] [Feature #10718] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49260 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r--io.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/io.c b/io.c
index c984971..c99f0c2 100644
--- a/io.c
+++ b/io.c
@@ -4415,11 +4415,18 @@ rb_io_close(VALUE io)
*
* If <em>ios</em> is opened by <code>IO.popen</code>,
* <code>close</code> sets <code>$?</code>.
+ *
+ * Calling this method on closed IO object is just ignored since Ruby 2.3.
*/
static VALUE
rb_io_close_m(VALUE io)
{
+ rb_io_t *fptr = RFILE(io)->fptr;
+ rb_io_check_initialized(fptr);
+ if (fptr->fd < 0) {
+ return Qnil;
+ }
rb_io_check_closed(RFILE(io)->fptr);
rb_io_close(io);
return Qnil;