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) 53329: [Backport #11885]

Browse source 
* io.c (io_getpartial): remove unused kwarg from template

	* test/ruby/test_io.rb (test_readpartial_bad_args): new
	  [Bug #11885]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54352 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2016-03-29 04:56:07 +00:00
parent 6b73bb455e
commit e6489da9e3
4 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Tue Mar 29 13:50:30 2016 Eric Wong <e@80x24.org>
* io.c (io_getpartial): remove unused kwarg from template
* test/ruby/test_io.rb (test_readpartial_bad_args): new
[Bug #11885]
Tue Mar 29 13:41:03 2016 Tadashi Saito <tadashi_saito@dwango.co.jp> Tue Mar 29 13:41:03 2016 Tadashi Saito <tadashi_saito@dwango.co.jp>
* compile.c, cont.c, doc, man: fix common misspelling. * compile.c, cont.c, doc, man: fix common misspelling.

2
io.c
View file

@ -2506,7 +2506,7 @@ io_getpartial(int argc, VALUE *argv, VALUE io, VALUE opts, int nonblock)
long n, len; long n, len;
struct read_internal_arg arg; struct read_internal_arg arg;
rb_scan_args(argc, argv, "11:", &length, &str, NULL); rb_scan_args(argc, argv, "11", &length, &str);
if ((len = NUM2LONG(length)) < 0) { if ((len = NUM2LONG(length)) < 0) {
rb_raise(rb_eArgError, "negative length %ld given", len); rb_raise(rb_eArgError, "negative length %ld given", len);

11
test/ruby/test_io.rb
View file

@ -3186,6 +3186,17 @@ End
} }
end end
def test_readpartial_bad_args
IO.pipe do |r, w|
w.write '.'
buf = String.new
assert_raise(ArgumentError) { r.readpartial(1, buf, exception: false) }
assert_raise(TypeError) { r.readpartial(1, exception: false) }
assert_equal [[r],[],[]], IO.select([r], nil, nil, 1)
assert_equal '.', r.readpartial(1)
end
end
def test_sysread_unlocktmp_ensure def test_sysread_unlocktmp_ensure
bug8669 = '[ruby-core:56121] [Bug #8669]' bug8669 = '[ruby-core:56121] [Bug #8669]'

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.0" #define RUBY_VERSION "2.3.0"
#define RUBY_RELEASE_DATE "2016-03-29" #define RUBY_RELEASE_DATE "2016-03-29"
#define RUBY_PATCHLEVEL 10 #define RUBY_PATCHLEVEL 11
#define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_MONTH 3