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

merge revision(s) 58040,58041:

Browse source 
stringio.c: check character code

	* ext/stringio/stringio.c (strio_ungetc): check if the character
	  code is valid in the encoding.  reported by Ahmad Sherif
	  (ahmadsherif) at https://hackerone.com/reports/209593.
	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/branches/ruby_2_4@58052 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2017-03-22 05:54:22 +00:00
parent 93e44f8802
commit 7e811007e2
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ext/stringio/stringio.c
View file

@ -767,13 +767,15 @@ strio_ungetc(VALUE self, VALUE c)
check_modifiable(ptr);
if (NIL_P(c)) return Qnil;
if (FIXNUM_P(c)) {
int cc = FIX2INT(c);
if (RB_INTEGER_TYPE_P(c)) {
int len, cc = NUM2INT(c);
char buf[16];
enc = rb_enc_get(ptr->string);
len = rb_enc_codelen(cc, enc);
if (len <= 0) rb_enc_uint_chr(cc, enc);
rb_enc_mbcput(cc, buf, enc);
return strio_unget_bytes(ptr, buf, rb_enc_codelen(cc, enc));
return strio_unget_bytes(ptr, buf, len);
}
else {
SafeStringValue(c);

3
test/stringio/test_stringio.rb
View file

@ -453,6 +453,9 @@ class TestStringIO < Test::Unit::TestCase
f.ungetc("y".ord)
assert_equal("y", f.getc)
assert_equal("2", f.getc)
assert_raise(RangeError) {f.ungetc(0x1ffffff)}
assert_raise(RangeError) {f.ungetc(0xffffffffffffff)}
ensure
f.close unless f.closed?
end

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.4.1"
#define RUBY_RELEASE_DATE "2017-03-22"
#define RUBY_PATCHLEVEL 110
#define RUBY_PATCHLEVEL 111
#define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 3