diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-11-19 08:10:48 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-11-19 08:10:48 +0000 |
commit | 412b6b5b0234a21b91fafc101fc8175b8e1b97f8 (patch) | |
tree | bf9c68f3433cfd70a1076b84caddb9e9b803be63 /io.c | |
parent | 38adc0c1e08c0b754c55624e9a0661a633fa7997 (diff) |
io.c: ungetbyte silently ignores upper bits
The behaviour of IO#ungetbyte has been depending on the width of
Fixnums. Fixnums should be invisible nowadays. It must be a
bug. Fix [Bug #14359]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65802 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r-- | io.c | 14 |
1 files changed, 12 insertions, 2 deletions
@@ -4212,8 +4212,18 @@ rb_io_ungetbyte(VALUE io, VALUE b) rb_io_check_byte_readable(fptr); if (NIL_P(b)) return Qnil; if (FIXNUM_P(b)) { - char cc = FIX2INT(b); - b = rb_str_new(&cc, 1); + int i = FIX2INT(b); + if (0 <= i && i <= UCHAR_MAX) { + unsigned char cc = i & 0xFF; + b = rb_str_new((const char *)&cc, 1); + } + else { + rb_raise(rb_eRangeError, + "integer % d too big to convert into `unsigned char'", i); + } + } + else if (RB_TYPE_P(b, T_BIGNUM)) { + rb_raise(rb_eRangeError, "bignum too big to convert into `unsigned char'"); } else { SafeStringValue(b); |