From 11e58d6d1dedd57130371436735219d84b877be0 Mon Sep 17 00:00:00 2001 From: akr Date: Thu, 21 Aug 2008 17:44:38 +0000 Subject: * io.c (rb_io_extract_modeenc): use rb_check_to_integer to test integer. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18759 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ io.c | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 413b60e34..a40328c06 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Aug 22 02:42:35 2008 Tanaka Akira + + * io.c (rb_io_extract_modeenc): use rb_check_to_integer to test + integer. + Fri Aug 22 02:25:04 2008 Tanaka Akira * iseq.c (iseq_inspect): don't raise on uninitialized object. diff --git a/io.c b/io.c index 3139369d5..d22dc3800 100644 --- a/io.c +++ b/io.c @@ -3813,6 +3813,7 @@ rb_io_extract_modeenc(VALUE mode, VALUE opthash, int modenum, flags; rb_encoding *enc, *enc2; int has_enc = 0; + VALUE intmode; enc = NULL; enc2 = NULL; @@ -3821,11 +3822,11 @@ rb_io_extract_modeenc(VALUE mode, VALUE opthash, flags = FMODE_READABLE; modenum = O_RDONLY; } - else if (FIXNUM_P(mode)) { - modenum = FIX2INT(mode); + else if (!NIL_P(intmode = rb_check_to_integer(mode, "to_int"))) { + modenum = NUM2INT(intmode); flags = rb_io_modenum_flags(modenum); } - else { /* xxx: Bignum, to_int */ + else { const char *p; SafeStringValue(mode); p = StringValueCStr(mode); -- cgit