ruby-changes:38728
From: usa <ko1@a...>
Date: Tue, 9 Jun 2015 16:31:23 +0900 (JST)
Subject: [ruby-changes:38728] usa:r50809 (ruby_2_1): merge revision(s) 50685: [Backport #11198]
usa 2015-06-09 16:31:14 +0900 (Tue, 09 Jun 2015) New Revision: 50809 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=50809 Log: merge revision(s) 50685: [Backport #11198] * ext/socket/ancdata.c: use RB_GC_GUARD instead of volatile [ruby-core:69419] [Feature #11198] Modified directories: branches/ruby_2_1/ Modified files: branches/ruby_2_1/ChangeLog branches/ruby_2_1/ext/socket/ancdata.c branches/ruby_2_1/version.h Index: ruby_2_1/ChangeLog =================================================================== --- ruby_2_1/ChangeLog (revision 50808) +++ ruby_2_1/ChangeLog (revision 50809) @@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1 +Tue Jun 9 16:29:49 2015 Eric Wong <e@8...> + + * ext/socket/ancdata.c: use RB_GC_GUARD instead of volatile + [ruby-core:69419] [Feature #11198] + Tue Jun 9 16:26:48 2015 Eric Wong <e@8...> * ext/openssl/ossl_asn1.c (ossl_asn1_traverse, ossl_asn1_decode, Index: ruby_2_1/ext/socket/ancdata.c =================================================================== --- ruby_2_1/ext/socket/ancdata.c (revision 50808) +++ ruby_2_1/ext/socket/ancdata.c (revision 50809) @@ -1133,7 +1133,7 @@ bsock_sendmsg_internal(int argc, VALUE * https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/socket/ancdata.c#L1133 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 @@ -1289,6 +1289,9 @@ bsock_sendmsg_internal(int argc, VALUE * https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/socket/ancdata.c#L1289 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); } Index: ruby_2_1/version.h =================================================================== --- ruby_2_1/version.h (revision 50808) +++ ruby_2_1/version.h (revision 50809) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1 #define RUBY_VERSION "2.1.7" #define RUBY_RELEASE_DATE "2015-06-09" -#define RUBY_PATCHLEVEL 365 +#define RUBY_PATCHLEVEL 366 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 6 Property changes on: ruby_2_1 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r50685 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/