summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-08 09:34:46 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-08 09:34:46 +0000
commit2aa0c8dbf8403ac5298b423a7c8dc461cb6e4ccf (patch)
treeedd89f0853d9dc90cc970dc66008419fcb8d6f24
parent1145eb5247a1b7b8c2ad67405383fec9d1ef1ce2 (diff)
downloadruby-2aa0c8dbf8403ac5298b423a7c8dc461cb6e4ccf.tar.gz
ruby-2aa0c8dbf8403ac5298b423a7c8dc461cb6e4ccf.tar.xz
ruby-2aa0c8dbf8403ac5298b423a7c8dc461cb6e4ccf.zip
* io.c (rb_io_s_binread): ensures file path. [ruby-dev:37940]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@22121 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--io.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 84806efa7..cbada31fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Feb 8 18:34:43 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * io.c (rb_io_s_binread): ensures file path. [ruby-dev:37940]
+
Sun Feb 8 13:52:02 2009 Tanaka Akira <akr@fsij.org>
* ext/socket/raddrinfo.c (init_unix_addrinfo): add socktype argument.
diff --git a/io.c b/io.c
index edfcdd646..9cac7631c 100644
--- a/io.c
+++ b/io.c
@@ -7370,6 +7370,7 @@ rb_io_s_binread(int argc, VALUE *argv, VALUE io)
struct foreach_arg arg;
rb_scan_args(argc, argv, "12", NULL, NULL, &offset);
+ FilePathValue(argv[0]);
arg.io = rb_io_open(argv[0], rb_str_new_cstr("rb:ASCII-8BIT"), Qnil, Qnil);
if (NIL_P(arg.io)) return Qnil;
arg.argv = argv+1;