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) 50685: [Backport #11198]

Browse source 
* ext/socket/ancdata.c: use RB_GC_GUARD instead of volatile
	  [ruby-core:69419] [Feature #11198]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50838 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2015-06-11 17:18:12 +00:00
parent 70e6382b73
commit 7ebca22266
3 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Fri Jun 12 01:39:49 2015 Eric Wong <e@80x24.org>
* ext/socket/ancdata.c: use RB_GC_GUARD instead of volatile
[ruby-core:69419] [Feature #11198]
Fri Jun 12 01:16:13 2015 Eric Wong <e@80x24.org>
* ext/openssl/ossl_asn1.c (ossl_asn1_traverse, ossl_asn1_decode,

5
ext/socket/ancdata.c
View file

@ -1135,7 +1135,7 @@ bsock_sendmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
struct msghdr mh;
struct iovec iov;
#if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)
volatile VALUE controls_str = 0;
VALUE controls_str = 0;
VALUE *controls_ptr = NULL;
int family;
#endif
@ -1291,6 +1291,9 @@ bsock_sendmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
rb_readwrite_sys_fail(RB_IO_WAIT_WRITABLE, "sendmsg(2) would block");
rb_sys_fail("sendmsg(2)");
}
#if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)
RB_GC_GUARD(controls_str);
#endif
return SSIZET2NUM(ss);
}

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.3"
#define RUBY_RELEASE_DATE "2015-06-12"
#define RUBY_PATCHLEVEL 132
#define RUBY_PATCHLEVEL 133
#define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 6