diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-21 03:15:57 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-21 03:15:57 +0000 |
| commit | bd8597a9993491479d2e03a4ded55e864b2225b4 (patch) | |
| tree | 89c8a73a702739d419e34a69fc14b99644afa4b6 | |
| parent | da2e7c0c6c63bfb549322c7af2d43154dfc52cfb (diff) | |
| download | ruby-bd8597a9993491479d2e03a4ded55e864b2225b4.tar.gz | |
stringio.c: check range
* ext/stringio/stringio.c (strio_ungetc): raise RangeError instead
of TypeError at too big value, as well as IO#ungetc.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58041 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ext/stringio/stringio.c | 4 | ||||
| -rw-r--r-- | test/stringio/test_stringio.rb | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c index d6833976af..08524b4d9e 100644 --- a/ext/stringio/stringio.c +++ b/ext/stringio/stringio.c @@ -766,8 +766,8 @@ strio_ungetc(VALUE self, VALUE c) check_modifiable(ptr); if (NIL_P(c)) return Qnil; - if (FIXNUM_P(c)) { - int len, cc = FIX2INT(c); + if (RB_INTEGER_TYPE_P(c)) { + int len, cc = NUM2INT(c); char buf[16]; enc = rb_enc_get(ptr->string); diff --git a/test/stringio/test_stringio.rb b/test/stringio/test_stringio.rb index 30370f5ca6..667fe3ea81 100644 --- a/test/stringio/test_stringio.rb +++ b/test/stringio/test_stringio.rb @@ -455,6 +455,7 @@ class TestStringIO < Test::Unit::TestCase assert_equal("2", f.getc) assert_raise(RangeError) {f.ungetc(0x1ffffff)} + assert_raise(RangeError) {f.ungetc(0xffffffffffffff)} ensure f.close unless f.closed? end |