diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-01-15 06:41:58 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-01-15 06:41:58 +0000 |
commit | d154bec0d5f0dd32e0d30559ab8a0a7ed8be98d2 (patch) | |
tree | 742aefd4559c4b84b11de474ae6fb005c037faee /io.c | |
parent | 5e84537d32c3e2f21071384e2c967fe0308d408d (diff) | |
download | ruby-d154bec0d5f0dd32e0d30559ab8a0a7ed8be98d2.tar.gz |
setbyte / ungetbyte allow out-of-range integers
* string.c: String#setbyte to accept arbitrary integers [Bug #15460]
* io.c: ditto for IO#ungetbyte
* ext/strringio/stringio.c: ditto for StringIO#ungetbyte
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66824 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r-- | io.c | 28 |
1 files changed, 11 insertions, 17 deletions
@@ -4258,23 +4258,17 @@ rb_io_ungetbyte(VALUE io, VALUE b) GetOpenFile(io, fptr); rb_io_check_byte_readable(fptr); - if (NIL_P(b)) return Qnil; - if (FIXNUM_P(b)) { - 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); + switch (TYPE(b)) { + case T_NIL: + return Qnil; + case T_FIXNUM: + case T_BIGNUM: ; + VALUE v = rb_int_modulo(b, INT2FIX(256)); + unsigned char c = NUM2INT(v) & 0xFF; + b = rb_str_new((const char *)&c, 1); + break; + default: + SafeStringValue(b); } io_ungetbyte(b, fptr); return Qnil; |