diff options
| author | Tomoyuki Sahara <[email protected]> | 2017-05-23 15:06:15 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-05-23 15:06:15 +0900 |
| commit | 87771ecf920d3fd7bc39ddb82fde040e5158718c (patch) | |
| tree | 033ee16136bdb3404d5e081d7a1f5c2fb3d8aeb7 /src | |
| parent | 6836f424c5ff95d0114a426010b22254804bc9a3 (diff) | |
| parent | 0bbd60b52348a9c1938d8cce7a1d5aea996e7e1e (diff) | |
| download | mruby-87771ecf920d3fd7bc39ddb82fde040e5158718c.tar.gz mruby-87771ecf920d3fd7bc39ddb82fde040e5158718c.zip | |
Merge pull request #79 from ksss/ioerror
Fix some spec for IO#sysread
Diffstat (limited to 'src')
| -rw-r--r-- | src/io.c | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -623,7 +623,10 @@ 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); } if (mrb_nil_p(buf)) { @@ -633,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 */ |
