archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-24 21:44:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 53259: [Backport #11862]

Browse source 
* ext/socket/init.c (rsock_init_sock): reject reserved FDs
	  [ruby-core:72445] [Bug #11862]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@54039 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2016-03-08 18:51:58 +00:00
parent f429ee01d2
commit cb37e4013e
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Wed Mar 9 03:51:48 2016 Eric Wong <e@80x24.org>
* ext/socket/init.c (rsock_init_sock): reject reserved FDs
[ruby-core:72445] [Bug #11862]
Wed Mar 9 03:41:27 2016 Eric Wong <e@80x24.org> Wed Mar 9 03:41:27 2016 Eric Wong <e@80x24.org>
* ext/socket/init.c (rsock_init_sock): check FD after validating * ext/socket/init.c (rsock_init_sock): check FD after validating

2
ext/socket/init.c
View file

@ -58,7 +58,7 @@ rsock_init_sock(VALUE sock, int fd)
{ {
rb_io_t *fp; rb_io_t *fp;
if (!is_socket(fd)) { if (!is_socket(fd) || rb_reserved_fd_p(fd)) {
errno = EBADF; errno = EBADF;
rb_sys_fail("not a socket file descriptor"); rb_sys_fail("not a socket file descriptor");
} }

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.5" #define RUBY_VERSION "2.2.5"
#define RUBY_RELEASE_DATE "2016-03-09" #define RUBY_RELEASE_DATE "2016-03-09"
#define RUBY_PATCHLEVEL 243 #define RUBY_PATCHLEVEL 244
#define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_MONTH 3