From 844b2c368fc4bf852ea1a5f24731ae4bdd6b2331 Mon Sep 17 00:00:00 2001 From: ksss Date: Sun, 21 May 2017 22:52:52 +0900 Subject: IO#sysread with 0 always return empty string --- src/io.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') diff --git a/src/io.c b/src/io.c index 51a659f0e..2a24b18a4 100644 --- a/src/io.c +++ b/src/io.c @@ -625,6 +625,9 @@ mrb_io_sysread(mrb_state *mrb, mrb_value io) if (maxlen < 0) { return mrb_nil_value(); } + else if (maxlen == 0) { + return mrb_str_new(mrb, NULL, maxlen); + } if (mrb_nil_p(buf)) { buf = mrb_str_new(mrb, NULL, maxlen); -- cgit v1.2.3 From 86edc9ab8541d15b470dd4fe0bac1e136c2ffced Mon Sep 17 00:00:00 2001 From: ksss Date: Sun, 21 May 2017 22:54:46 +0900 Subject: IO#sysread should raise IOError when closed --- src/io.c | 2 +- test/io.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/io.c b/src/io.c index 2a24b18a4..f15f182f2 100644 --- a/src/io.c +++ b/src/io.c @@ -636,7 +636,7 @@ mrb_io_sysread(mrb_state *mrb, mrb_value io) buf = mrb_str_resize(mrb, buf, maxlen); } - fptr = (struct mrb_io *)mrb_get_datatype(mrb, io, &mrb_io_type); + fptr = (struct mrb_io *)io_get_open_fptr(mrb, io); ret = read(fptr->fd, RSTRING_PTR(buf), maxlen); switch (ret) { case 0: /* EOF */ diff --git a/test/io.rb b/test/io.rb index 5a95961f3..02ab038bb 100644 --- a/test/io.rb +++ b/test/io.rb @@ -235,6 +235,7 @@ assert('IO.sysopen, IO#sysread') do end io.close assert_equal "", io.sysread(0) + assert_raise(IOError) { io.sysread(1) } io.closed? end -- cgit v1.2.3 From 0bbd60b52348a9c1938d8cce7a1d5aea996e7e1e Mon Sep 17 00:00:00 2001 From: ksss Date: Sun, 21 May 2017 22:55:28 +0900 Subject: IO#sysread should raise error when invalid pos --- src/io.c | 2 +- test/io.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/io.c b/src/io.c index f15f182f2..7a1121338 100644 --- a/src/io.c +++ b/src/io.c @@ -623,7 +623,7 @@ mrb_io_sysread(mrb_state *mrb, mrb_value io) mrb_get_args(mrb, "i|S", &maxlen, &buf); if (maxlen < 0) { - return mrb_nil_value(); + mrb_raise(mrb, E_ARGUMENT_ERROR, "negative expanding string size"); } else if (maxlen == 0) { return mrb_str_new(mrb, NULL, maxlen); diff --git a/test/io.rb b/test/io.rb index 02ab038bb..9ce8985f7 100644 --- a/test/io.rb +++ b/test/io.rb @@ -236,6 +236,7 @@ assert('IO.sysopen, IO#sysread') do io.close assert_equal "", io.sysread(0) assert_raise(IOError) { io.sysread(1) } + assert_raise(ArgumentError) { io.sysread(-1) } io.closed? end -- cgit v1.2.3