diff options
| -rw-r--r-- | io.c | 14 | ||||
| -rw-r--r-- | spec/ruby/core/io/ungetbyte_spec.rb | 22 |
2 files changed, 31 insertions, 5 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); diff --git a/spec/ruby/core/io/ungetbyte_spec.rb b/spec/ruby/core/io/ungetbyte_spec.rb index c22661582b..b7de1b7a6d 100644 --- a/spec/ruby/core/io/ungetbyte_spec.rb +++ b/spec/ruby/core/io/ungetbyte_spec.rb @@ -36,9 +36,25 @@ describe "IO#ungetbyte" do @io.getbyte.should == 97 end - it "puts back one byte for an Integer argument" do - @io.ungetbyte(4095).should be_nil - @io.getbyte.should == 255 + ruby_version_is ''...'2.6' do + it "puts back one byte for a Fixnum argument..." do + @io.ungetbyte(4095).should be_nil + @io.getbyte.should == 255 + end + + it "... but not for Bignum argument (eh?)" do + lambda { + @io.ungetbyte(0x4f7574206f6620636861722072616e6765) + }.should raise_error(TypeError) + end + end + + ruby_version_is '2.6' do + it "is an RangeError if the integr is not in 8bit" do + for i in [4095, 0x4f7574206f6620636861722072616e6765] do + lambda { @io.ungetbyte(i) }.should raise_error(RangeError) + end + end end it "raises an IOError if the IO is closed" do |