[macruby-changes] [4915] MacRuby/trunk/io.c

[source_changes at macosforge.org]

Revision: 4915
          http://trac.macosforge.org/projects/ruby/changeset/4915
Author:   watson1978 at gmail.com
Date:     2010-11-16 22:52:26 -0800 (Tue, 16 Nov 2010)
Log Message:
-----------
Some method of ARGF will throw an ArgumentError with closed stream.

Test Script:
{{{
require 'tempfile'
require 'test/unit/assertions.rb'
include Test::Unit::Assertions

unless(ARGV[0])
  puts "USAGE: #{$0} filename"
  exit
end

ARGF.close
assert_raise(ArgumentError) { ARGF.set_encoding("UTF-8") }
assert_raise(ArgumentError) { ARGF.tell }
assert_raise(ArgumentError) { ARGF.seek(0) }
assert_raise(ArgumentError) { ARGF.pos(0) }
assert_raise(ArgumentError) { ARGF.rewind }
assert_raise(ArgumentError) { ARGF.fileno }

puts :ok
}}}

Modified Paths:
--------------
    MacRuby/trunk/io.c

Modified: MacRuby/trunk/io.c
===================================================================
--- MacRuby/trunk/io.c	2010-11-16 05:05:24 UTC (rev 4914)
+++ MacRuby/trunk/io.c	2010-11-17 06:52:26 UTC (rev 4915)
@@ -4270,7 +4270,9 @@
 static VALUE
 argf_set_encoding(VALUE id, SEL sel, int argc, VALUE *argv)
 {
-    next_argv();
+    if (!next_argv()) {
+	rb_raise(rb_eArgError, "no stream to set encoding");
+    }
     ARGF_FORWARD(0, 0);
     return rb_io_set_encoding(ARGF.current_file, sel, argc, argv);
 }
@@ -4278,7 +4280,9 @@
 static VALUE
 argf_tell(VALUE argf, SEL sel)
 {
-    next_argv();
+    if (!next_argv()) {
+	rb_raise(rb_eArgError, "no stream to tell");
+    }
     ARGF_FORWARD(0, 0);
     return rb_io_tell(ARGF.current_file, 0);
 }
@@ -4286,7 +4290,9 @@
 static VALUE
 argf_seek_m(VALUE argf, SEL sel, int argc, VALUE *argv)
 {
-    next_argv();
+    if (!next_argv()) {
+	rb_raise(rb_eArgError, "no stream to seek");
+    }
     ARGF_FORWARD(0, 0);
     return rb_io_seek_m(ARGF.current_file, sel, argc, argv);
 }
@@ -4294,7 +4300,9 @@
 static VALUE
 argf_set_pos(VALUE argf, SEL sel, VALUE offset)
 {
-    next_argv();
+    if (!next_argv()) {
+	rb_raise(rb_eArgError, "no stream to set position");
+    }
     ARGF_FORWARD(0, 0);
     return rb_io_set_pos(ARGF.current_file, sel, offset);
 }
@@ -4302,7 +4310,9 @@
 static VALUE
 argf_rewind(VALUE argf, SEL sel)
 {
-    next_argv();
+    if (!next_argv()) {
+	rb_raise(rb_eArgError, "no stream to rewind");
+    }
     ARGF_FORWARD(0, 0);
     return rb_io_rewind(ARGF.current_file, 0);
 }
@@ -4310,7 +4320,9 @@
 static VALUE
 argf_fileno(VALUE argf, SEL sel)
 {
-    next_argv();
+    if (!next_argv()) {
+	rb_raise(rb_eArgError, "no stream");
+    }
     ARGF_FORWARD(0, 0);
     return rb_io_fileno(ARGF.current_file, 0);
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20101116/dca8f840/attachment.html>