kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

io.c: ungetbyte silently ignores upper bits

Browse source 
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
This commit is contained in:
shyouhei 2018-11-19 08:10:48 +00:00
parent 38adc0c1e0
commit 412b6b5b02
2 changed files with 31 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
io.c
View file

@ -4212,8 +4212,18 @@ rb_io_ungetbyte(VALUE io, VALUE b)
rb_io_check_byte_readable(fptr); rb_io_check_byte_readable(fptr);
if (NIL_P(b)) return Qnil; if (NIL_P(b)) return Qnil;
if (FIXNUM_P(b)) { if (FIXNUM_P(b)) {
char cc = FIX2INT(b); int i = FIX2INT(b);
b = rb_str_new(&cc, 1); 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 { else {
SafeStringValue(b); SafeStringValue(b);

18
spec/ruby/core/io/ungetbyte_spec.rb
View file

@ -36,11 +36,27 @@ describe "IO#ungetbyte" do
@io.getbyte.should == 97 @io.getbyte.should == 97
end end
it "puts back one byte for an Integer argument" do ruby_version_is ''...'2.6' do
it "puts back one byte for a Fixnum argument..." do
@io.ungetbyte(4095).should be_nil @io.ungetbyte(4095).should be_nil
@io.getbyte.should == 255 @io.getbyte.should == 255
end 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 it "raises an IOError if the IO is closed" do
@io.close @io.close
lambda { @io.ungetbyte(42) }.should raise_error(IOError) lambda { @io.ungetbyte(42) }.should raise_error(IOError)